Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
gandhimathi 2018-08-21 10:27:40 +05:30
commit 088e626eb0
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Apollo/api/application/config/database.php
View File

@ -75,20 +75,10 @@ $query_builder = TRUE;
$db['default'] = array( $db['default'] = array(
'dsn' => '', 'dsn' => '',
<<<<<<< HEAD
// 'hostname' => 'apollodec.com',
// 'username' => 'apollod4_SIT',
// 'password' => 'apollosit1234',
// 'database' => 'apollod4_ApolloDECNEWSIT',
=======
'hostname' => 'apollodec.com', 'hostname' => 'apollodec.com',
// 'username' => 'apollod4_SIT', 'username' => 'apollod4_DEV',
// 'password' => 'apollosit1234', 'password' => 'apollo1234',
// 'database' => 'apollod4_ApolloDECNEWSIT', 'database' => 'apollod4_ApolloDECDev',
>>>>>>> 3f287c92a22bb6528c89be19aabcde2ec3393f70
'username' => 'apollod4_DEV',
'password' => 'apollo1234',
'database' => 'apollod4_ApolloDECDev',
'dbdriver' => 'mysqli', 'dbdriver' => 'mysqli',
'dbprefix' => '', 'dbprefix' => '',
'pconnect' => FALSE, 'pconnect' => FALSE,