ci: fixed docker-entrypoint.sh

cashwarden · Oct 21, 2020 · aff660c · aff660c
1 parent 1f412ab
commit aff660c
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/image-files/usr/local/bin/docker-entrypoint.sh b/image-files/usr/local/bin/docker-entrypoint.sh
@@ -1,15 +1,10 @@
 #!/bin/sh
 
-<<<<<<< HEAD
 echo '   _____                       .__                '
 echo '  /  _  \   ____    ____  __ __|  | _____ _______ '
 echo ' /  /_\  \ /    \  / ___\|  |  \  | \__  \\_  __ \'
 echo '/    |    \   |  \/ /_/  >  |  /  |__/ __ \|  | \/'
 echo '\____|__  /___|  /\___  /|____/|____(____  /__|   '
 echo '        \/     \//_____/                 \/       '
-=======
-printf "Starting nginx...\n\n"
-# nginx -g "daemon off;"
->>>>>>> 56321577457a22170da8961e08d9fe581cee2eb4
 
 exec "$@"