Merge branch 'develop' of github.com:fhjbalfoort/CodeIgniter into develop
Conflicts:
application/config/database.php
diff --git a/application/config/database.php b/application/config/database.php
index 12ef7fe..58eec4b 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -91,23 +91,5 @@
$db['default']['stricton'] = FALSE;
$db['default']['failover'] = array();
-$db['default']['hostname'] = 'localhost';
-$db['default']['username'] = '';
-$db['default']['password'] = '';
-$db['default']['database'] = '';
-$db['default']['dbdriver'] = 'mysql';
-$db['default']['dbprefix'] = '';
-$db['default']['pconnect'] = TRUE;
-$db['default']['db_debug'] = TRUE;
-$db['default']['cache_on'] = FALSE;
-$db['default']['cachedir'] = '';
-$db['default']['char_set'] = 'utf8';
-$db['default']['dbcollat'] = 'utf8_general_ci';
-$db['default']['swap_pre'] = '';
-$db['default']['autoinit'] = TRUE;
-$db['default']['stricton'] = FALSE;
-$db['default']['failover'] = array();
-
-
/* End of file database.php */
/* Location: ./application/config/database.php */
\ No newline at end of file