From b9d5a5ce653dbcbcbf37eb12b78701cb89390d91 Mon Sep 17 00:00:00 2001
From: davidcallizaya <david.callizaya@processmaker.com>
Date: Sat, 3 Jun 2017 15:37:10 -0400
Subject: [PATCH] HOR-3214 Fix conflict

---
 phpunit.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index 6978f61fb..851e776e4 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -54,8 +54,8 @@
         <var name="DB_NAME" value="wf_test" />
         <var name="DB_USER" value="root" />
         <var name="DB_PASS" value="" />
-        <var name="PATH_DB" value="./test_shared/sites/" />
-        <var name="PATH_DATA" value="./test_shared/" />
+        <var name="PATH_DB" value="./test_shared/workflow_data/sites/" />
+        <var name="PATH_DATA" value="./test_shared/workflow_data/" />
         <var name="APP_HOST" value="localhost" />
         <var name="HTTPS" value="off" />
     </php>