fixed parser error (opps)

and no need for `some foo bar`, use $(some foo bar)

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index dd41378a09e0f2ca653374f41433e09fc2b90526..fb238cd531f7c21de550d46beec04a27012db74e 100755 (executable)
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -41,11 +41,7 @@ fi
 SDIR=`dirname $0`
 DIR=`$SDIR/getpiddir.php $SITE`
 
-<<<<<<< 15f4fc3b4bad6420ae8fca702b250e5c69ce5632
-DAEMONS=`php $SDIR/getvaliddaemons.php $ARGSG`
-=======
 DAEMONS=`$SDIR/getvaliddaemons.php`
->>>>>>> No need for php interpreter again as this script is executable.
 
 for f in $DAEMONS; do
     f=$(basename $f .php)