Commit 54229e58 authored by Chi Bui's avatar Chi Bui 👀

edit merge

parent b07a2507
......@@ -767,7 +767,6 @@
include $app_root . '/' . $site_path . '/settings.local.php';
}
$databases['default']['default'] = array (
<<<<<<< HEAD
'database' => 'invi_ptd',
'username' => 'invi_dev',
'password' => 'Invi@123456789a@A',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment