From ead2a81baf84f4a1502157e40904f2e7a9047a1f Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 23 Aug 2012 18:45:41 +0200
Subject: [PATCH] Fix: merge problem

---
 htdocs/webservices/demo_wsclient_invoice.php-NORUN          | 4 ++--
 htdocs/webservices/demo_wsclient_other.php-NORUN            | 4 ++--
 htdocs/webservices/demo_wsclient_productorservice.php-NORUN | 4 ++--
 htdocs/webservices/demo_wsclient_thirdparty.php-NORUN       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/webservices/demo_wsclient_invoice.php-NORUN b/htdocs/webservices/demo_wsclient_invoice.php-NORUN
index 17c76af2081..e0287870666 100755
--- a/htdocs/webservices/demo_wsclient_invoice.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_invoice.php-NORUN
@@ -23,8 +23,8 @@
 // This is to make Dolibarr working with Plesk
 set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 
-require_once("../master.inc.php");
-require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
+require_once '../master.inc.php';
+require_once NUSOAP_PATH.'/nusoap.php';		// Include SOAP
 
 $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
 //$WS_DOL_URL = 'http://localhost:8080/';	// To test with Soapui mock. If not a page, should end with /
diff --git a/htdocs/webservices/demo_wsclient_other.php-NORUN b/htdocs/webservices/demo_wsclient_other.php-NORUN
index 713d6741972..21ef7d966e7 100755
--- a/htdocs/webservices/demo_wsclient_other.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_other.php-NORUN
@@ -23,8 +23,8 @@
 // This is to make Dolibarr working with Plesk
 set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 
-require_once("../master.inc.php");
-require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
+require_once '../master.inc.php';
+require_once NUSOAP_PATH.'/nusoap.php';		// Include SOAP
 
 $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
 //$WS_DOL_URL = 'http://localhost:8080/';	// If not a page, should end with /
diff --git a/htdocs/webservices/demo_wsclient_productorservice.php-NORUN b/htdocs/webservices/demo_wsclient_productorservice.php-NORUN
index 0bbd0f00393..aa0f1a31ea5 100755
--- a/htdocs/webservices/demo_wsclient_productorservice.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_productorservice.php-NORUN
@@ -23,8 +23,8 @@
 // This is to make Dolibarr working with Plesk
 set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 
-require_once("../master.inc.php");
-require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
+require_once '../master.inc.php';
+require_once NUSOAP_PATH.'/nusoap.php';		// Include SOAP
 
 $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
 //$WS_DOL_URL = 'http://localhost:8080/';	// To test with Soapui mock. If not a page, should end with /
diff --git a/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN b/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
index 96f78df4d1d..519d417edb3 100755
--- a/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
@@ -23,8 +23,8 @@
 // This is to make Dolibarr working with Plesk
 set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 
-require_once("../master.inc.php");
-require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
+require_once '../master.inc.php';
+require_once NUSOAP_PATH.'/nusoap.php';		// Include SOAP
 
 $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
 //$WS_DOL_URL = 'http://localhost:8080/';	// If not a page, should end with /
-- 
GitLab