This is an automated email from the ASF dual-hosted git repository.
bharathkk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/samza-hello-samza.git
The following commit(s) were added to refs/heads/master by this push:
new 6e7e52e remove comited merge conflict. (#83)
6e7e52e is described below
commit 6e7e52e084c7647fc6594a36b2d318901b45db1c
Author: Adam Faris <[email protected]>
AuthorDate: Thu Apr 1 18:28:38 2021 -0700
remove comited merge conflict. (#83)
A merge conflict was checked in by mistake. This change removes the
conflict & changes the hello-samza version to 1.6
---
bin/deploy.sh | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/bin/deploy.sh b/bin/deploy.sh
index 167333e..060988f 100755
--- a/bin/deploy.sh
+++ b/bin/deploy.sh
@@ -23,8 +23,4 @@ base_dir=`pwd`
mvn clean package
mkdir -p $base_dir/deploy/samza
-<<<<<<< HEAD
-tar -xvf $base_dir/target/hello-samza-1.5.0-dist.tar.gz -C
$base_dir/deploy/samza
-=======
-tar -xvf $base_dir/target/hello-samza-1.5.0-SNAPSHOT-dist.tar.gz -C
$base_dir/deploy/samza
->>>>>>> origin/latest
+tar -xvf $base_dir/target/hello-samza-1.6.0-dist.tar.gz -C
$base_dir/deploy/samza
