From fb4133b265f813f4465d55e201adf3c25eeb6803 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Tue, 21 Aug 2018 10:10:35 +0530 Subject: [PATCH] db changes : kdk --- Apollo/api/application/config/database.php | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php index 20ed4d6f..f8df5be8 100755 --- a/Apollo/api/application/config/database.php +++ b/Apollo/api/application/config/database.php @@ -75,20 +75,10 @@ $query_builder = TRUE; $db['default'] = array( 'dsn' => '', -<<<<<<< HEAD - // 'hostname' => 'apollodec.com', - // 'username' => 'apollod4_SIT', - // 'password' => 'apollosit1234', - // 'database' => 'apollod4_ApolloDECNEWSIT', -======= 'hostname' => 'apollodec.com', -// 'username' => 'apollod4_SIT', -// 'password' => 'apollosit1234', -// 'database' => 'apollod4_ApolloDECNEWSIT', ->>>>>>> 3f287c92a22bb6528c89be19aabcde2ec3393f70 - 'username' => 'apollod4_DEV', - 'password' => 'apollo1234', - 'database' => 'apollod4_ApolloDECDev', + 'username' => 'apollod4_DEV', + 'password' => 'apollo1234', + 'database' => 'apollod4_ApolloDECDev', 'dbdriver' => 'mysqli', 'dbprefix' => '', 'pconnect' => FALSE,