forgot to save

Author: Yossi Farjoun

entrypoint.sh

@@ -8,15 +8,4 @@ if [ ! -z $INPUT_DOCKER_NETWORK ];
 then INPUT_OPTIONS="$INPUT_OPTIONS --network $INPUT_DOCKER_NETWORK"
 fi
 
-<<<<<<< HEAD
 exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS $INPUT_IMAGE $INPUT_SHELL $INPUT_SCRIPT_PREFIX "${INPUT_RUN//$'\n'/;}"
-=======
-if [ ! -z $INPUT_SHELL ];
-then INPUT_OPTIONS="$INPUT_OPTIONS --entrypoint=$INPUT_SHELL"
-fi
-
-if [ ! -z $INPUT_SHELL ];
-then INPUT_OPTIONS="$INPUT_OPTIONS --entrypoint=$INPUT_SHELL"
-fi
-exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS $INPUT_IMAGE $INPUT_PRECOMMAND_PREFIX "`cat semicolon_delimited_script`"
->>>>>>> 973a0bb... optional precommand prefix