Fix conflict
This commit is contained in:
davidcallizaya
2017-06-03 15:37:10 -04:00
parent 76427ca571
commit b9d5a5ce65

View File

@@ -54,8 +54,8 @@
<var name="DB_NAME" value="wf_test" /> <var name="DB_NAME" value="wf_test" />
<var name="DB_USER" value="root" /> <var name="DB_USER" value="root" />
<var name="DB_PASS" value="" /> <var name="DB_PASS" value="" />
<var name="PATH_DB" value="./test_shared/sites/" /> <var name="PATH_DB" value="./test_shared/workflow_data/sites/" />
<var name="PATH_DATA" value="./test_shared/" /> <var name="PATH_DATA" value="./test_shared/workflow_data/" />
<var name="APP_HOST" value="localhost" /> <var name="APP_HOST" value="localhost" />
<var name="HTTPS" value="off" /> <var name="HTTPS" value="off" />
</php> </php>