aboutsummaryrefslogtreecommitdiffstats
path: root/.openshift/action_hooks
diff options
context:
space:
mode:
Diffstat (limited to '.openshift/action_hooks')
-rwxr-xr-x.openshift/action_hooks/deploy4
1 files changed, 4 insertions, 0 deletions
diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy
index 1dca4a5e8..b99200b07 100755
--- 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