From bf624edf62e17c1a7c00f167c0c406da4016c577 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Wed, 22 Mar 2017 00:23:23 +0100
Subject: [PATCH] fixed parser error (opps) and no need for `some foo bar`, use
 $(some foo bar)

Signed-off-by: Roland Haeder <roland@mxchange.org>
---
 scripts/stopdaemons.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index dd41378a09..fb238cd531 100755
--- 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)
-- 
2.39.5