From 5494077cd755effc3204cdba8bfac5bd2d8ad74d Mon Sep 17 00:00:00 2001 From: Kyle Farris Date: Fri, 14 Oct 2011 16:50:14 -0300 Subject: Fixed merge error. --- application/config/migration.php | 1 - 1 file changed, 1 deletion(-) 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 -- cgit v1.2.3-24-g4f1b