Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed merge error.

  • Loading branch information...
commit 5494077cd755effc3204cdba8bfac5bd2d8ad74d 1 parent ad17f4b
@kylefarris authored
Showing with 0 additions and 1 deletion.
  1. +0 −1  application/config/migration.php
View
1  application/config/migration.php
@@ -111,5 +111,4 @@
/* End of file migration.php */
->>>>>>> a2125a5d830fd390b4cf35f77e9bb0558cfa2dd7:application/config/migration.php
/* Location: ./application/config/migration.php */
Please sign in to comment.
Something went wrong with that request. Please try again.