fixed bug in merge-branch

Author: Ian Redpath

scripts/bash/merge-branch.sh

@@ -37,6 +37,7 @@ if [ $? -ne 0 ]; then
 	exit 1
 else:
 	echo "INFO: local changes successfully pushed to openshift master"
+fi
 
 # deploy master
 rhc deploy master -a WebDevelopment
@@ -61,4 +62,4 @@ git branch -u origin/master
 if [ $? -ne 0 ]; then
 	echo "ERROR: unable to set local master branch to track from origin/master"
 	exit 1
-fi
+fi