trying to fix merge

2016-02-17 15:46:23 +00:00 · 2016-02-17 15:46:23 +00:00 · e589fe1c9c
--- a/application/config/migration.php
+++ b/application/config/migration.php
@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 7;
+$config['migration_version'] = 6;


 /*