Skip to content

P
ptd
Commit 54229e58 authored by Chi Bui's avatar Chi Bui 👀
Browse files
Options

edit merge

parent b07a2507
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
sites/default/settings.php
View file @ 54229e58
...@@ -767,7 +767,6 @@ ...@@ -767,7 +767,6 @@
include $app_root . '/' . $site_path . '/settings.local.php'; include $app_root . '/' . $site_path . '/settings.local.php';
} }
$databases['default']['default'] = array ( $databases['default']['default'] = array (
<<<<<<< HEAD
'database' => 'invi_ptd', 'database' => 'invi_ptd',
'username' => 'invi_dev', 'username' => 'invi_dev',
'password' => 'Invi@123456789a@A', '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