Issue #00 chore: updade merge issues

project-sunbird · Apr 9, 2018 · ab227c7 · ab227c7
1 parent 421a74e
commit ab227c7
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/deploy/sunbird_install.sh b/deploy/sunbird_install.sh
@@ -83,13 +83,10 @@ while getopts "s:h" o;do
             case "${s}" in
                 config)
                     echo -e "\n$(date)\n">>logs/config.log; config 2>&1 | tee -a logs/config.log
-<<<<<<< HEAD
-=======
                     exit 0
                     ;;
                 deps)
                     echo -e "\n$(date)\n">>logs/deps.log; deps 2>&1 | tee -a logs/config.log
->>>>>>> origin/release-1.5
                     exit 0
                     ;;
                 dbs)
@@ -112,10 +109,6 @@ while getopts "s:h" o;do
                     echo -e "\n$(date)\n">>logs/badger.log; badger 2>&1 | tee -a logs/badger.log
                     exit 0
                     ;;
-                badger)
-                    echo -e "\n$(date)\n">>logs/badger.log; badger 2>&1 | tee -a logs/badger.log
-                    exit 0
-                    ;;
                 core)
                     echo -e "\n$(date)\n">>core.log; core 2>&1 | tee -a logs/core.log
                     exit 0