diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-04 06:41:25 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-04 06:41:25 +0100 |
| commit | 86dd4e7ee03c5c95eed9830c81aafdd0346d71f3 (patch) | |
| tree | 1a836583dd36e5de94e075bdd33595be1000b28d | |
| parent | 714a93022f56d4c4dd5e6ad595dbdf2f8b403d6c (diff) | |
| download | volse-hubzilla-86dd4e7ee03c5c95eed9830c81aafdd0346d71f3.tar.gz volse-hubzilla-86dd4e7ee03c5c95eed9830c81aafdd0346d71f3.tar.bz2 volse-hubzilla-86dd4e7ee03c5c95eed9830c81aafdd0346d71f3.zip | |
Fixed deploy
| -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 |