diff options
Diffstat (limited to '.openshift/action_hooks')
| -rwxr-xr-x | .openshift/action_hooks/deploy | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index b99200b07..5b4fc4864 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -205,10 +205,6 @@ 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 |