diff options
| -rw-r--r-- | application/config/migration.php | 1 |
1 files changed, 0 insertions, 1 deletions
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 |