aboutsummaryrefslogtreecommitdiffstats
path: root/.openshift/action_hooks
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-03 23:26:00 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-03 23:26:00 +0100
commit714a93022f56d4c4dd5e6ad595dbdf2f8b403d6c (patch)
tree01b41f1acfacf1f8682f18e7b6a9ab98647978f7 /.openshift/action_hooks
parent8ca4fb37843aef29f613b3af7817a7a2353c7ded (diff)
parent35fd21531a05765c982431bd130d4e598c69ecaf (diff)
downloadvolse-hubzilla-714a93022f56d4c4dd5e6ad595dbdf2f8b403d6c.tar.gz
volse-hubzilla-714a93022f56d4c4dd5e6ad595dbdf2f8b403d6c.tar.bz2
volse-hubzilla-714a93022f56d4c4dd5e6ad595dbdf2f8b403d6c.zip
Removed deploy to get from upstream
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 5b4fc4864..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