Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge

  • Loading branch information...
commit 4c9fbc2f533126d16ab18ac5d5f4af8a8362aabd 2 parents 3019285 + 55ac213
@jcc2010 authored
Showing with 4 additions and 0 deletions.
  1. +4 −0 system/language/english/migration_lang.php
View
4 system/language/english/migration_lang.php
@@ -30,7 +30,11 @@
$lang['migration_multiple_version'] = "This are multiple migrations with the same version number: %d.";
$lang['migration_class_doesnt_exist'] = "The migration class \"%s\" could not be found.";
$lang['migration_missing_up_method'] = "The migration class \"%s\" is missing an 'up' method.";
+<<<<<<< HEAD
$lang['migration_missing_down_method'] = "The migration class \"%s\" is missing a 'down' method.";
+=======
+$lang['migration_missing_down_method'] = "The migration class \"%s\" is missing an 'down' method.";
+>>>>>>> 55ac2138482154c3aed7d6a6a2b6f196d0a04d9e
$lang['migration_invalid_filename'] = "Migration \"%s\" has an invalid filename.";
Please sign in to comment.
Something went wrong with that request. Please try again.