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
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 @@
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
