| commit | 5494077cd755effc3204cdba8bfac5bd2d8ad74d | [log] [tgz] |
|---|---|---|
| author | Kyle Farris <kylefarris@gmail.com> | Fri Oct 14 16:50:14 2011 -0300 |
| committer | Kyle Farris <kylefarris@gmail.com> | Fri Oct 14 16:50:14 2011 -0300 |
| tree | b60329df42a723c814e3b291e3a5fe40866aa9d1 | |
| parent | ad17f4b932b3728c1e299b48f28b3ae0dbdd6b0b [diff] |
Fixed merge error.
diff --git a/application/config/migration.php b/application/config/migration.php index 41b8962..8f3a2f6 100644 --- a/application/config/migration.php +++ b/application/config/migration.php
@@ -111,5 +111,4 @@ /* End of file migration.php */ ->>>>>>> a2125a5d830fd390b4cf35f77e9bb0558cfa2dd7:application/config/migration.php /* Location: ./application/config/migration.php */ \ No newline at end of file