From 86dd4e7ee03c5c95eed9830c81aafdd0346d71f3 Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Mon, 4 Jan 2016 06:41:25 +0100 Subject: Fixed deploy --- .openshift/action_hooks/deploy | 4 ---- 1 file changed, 4 deletions(-) (limited to '.openshift/action_hooks/deploy') 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 -- cgit v1.2.3