Merge branch 'uat_staging' of https://gitlab.techware.co.in/timeout/timeOut into tobin

# Conflicts: # application/config/database.php

Merge branch 'uat_staging' of https://gitlab.techware.co.in/timeout/timeOut into tobin
4286a678 · Tobin · d37478bb · 78eccf4b · 4286a678 · 4286a678
Commit 4286a678 authored Oct 31, 2019 by Tobin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

database.php application/config/database.php +2 -3

.gitkeep sql/.gitkeep +0 -0

timeout.sql sql/timeout.sql +0 -0

No files found.
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -77,9 +77,8 @@ $db['default'] = array(
 	'dsn'	=> '',
 	'hostname' => 'localhost',
 	'username' => 'root',
-    'password' => 'Golden_123',
-    'database' => 'timeout_uat',
-	'dbdriver' => 'mysqli',
+	'password' => 'Golden_123',
+	'database' => 'timeout_uat',	'dbdriver' => 'mysqli',
 	'dbprefix' => '',
 	'pconnect' => FALSE,
 	'db_debug' => (ENVIRONMENT !== 'production'),

--- a/sql/.gitkeep
+++ b/sql/.gitkeep
--- a/sql/timeout.sql
+++ b/sql/timeout.sql