summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorKyle Farris <kylefarris@gmail.com>2011-10-14 21:50:14 +0200
committerKyle Farris <kylefarris@gmail.com>2011-10-14 21:50:14 +0200
commit5494077cd755effc3204cdba8bfac5bd2d8ad74d (patch)
treeb60329df42a723c814e3b291e3a5fe40866aa9d1 /application/config
parentad17f4b932b3728c1e299b48f28b3ae0dbdd6b0b (diff)
Fixed merge error.
Diffstat (limited to 'application/config')
-rw-r--r--application/config/migration.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/application/config/migration.php b/application/config/migration.php
index 41b89626f..8f3a2f6c5 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -111,5 +111,4 @@ $config['migration_path'] = APPPATH . 'migrations/';
/* End of file migration.php */
->>>>>>> a2125a5d830fd390b4cf35f77e9bb0558cfa2dd7:application/config/migration.php
/* Location: ./application/config/migration.php */ \ No newline at end of file