Removed deploy to get from upstream

2016-01-03 23:26:00 +01:00
parent 8ca4fb3784 35fd21531a
commit 714a93022f
6 changed files with 56 additions and 16 deletions
--- a/.openshift/action_hooks/deploy
+++ b/.openshift/action_hooks/deploy
@@ -205,6 +205,10 @@ cd ${OPENSHIFT_REPO_DIR}
 util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp

 # Hubzilla Chess
+<<<<<<< HEAD
 echo "Try to add or update Hubzilla chess "
+=======
+echo "Try to add or update Hubzilla chess to Hubzilla on OpenShift"
+>>>>>>> upstream/master
 cd ${OPENSHIFT_REPO_DIR}
 util/add_addon_repo https://gitlab.com/zot/hubzilla-chess.git Chess