Fix startpaassteemd.sh

steemit · Feb 14, 2018 · ed7abf4 · ed7abf4
1 parent 2e9fcb3
commit ed7abf4
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/contrib/startpaassteemd.sh b/contrib/startpaassteemd.sh
@@ -2,19 +2,12 @@
 
 VERSION=`cat /etc/steemdversion`
 
-<<<<<<< HEAD
-if [[ ! "$IS_BROADCAST_NODE" ]]; then
-  STEEMD="/usr/local/steemd-full/bin/steemd"
-else
-  STEEMD="/usr/local/steemd-default/bin/steemd"
-=======
 if [[ "$IS_BROADCAST_NODE" ]]; then
   STEEMD="/usr/local/steemd-default/bin/steemd"
 elif [[ "$IS_AH_NODE" ]]; then
   STEEMD="/usr/local/steemd-default/bin/steemd"
 else
   STEEMD="/usr/local/steemd-full/bin/steemd"
->>>>>>> develop
 fi
 
 chown -R steemd:steemd $HOME