summaryrefslogtreecommitdiffstats
path: root/application/config/migration.php
diff options
context:
space:
mode:
authorKyle Farris <kylefarris@gmail.com>2011-10-14 21:51:07 +0200
committerKyle Farris <kylefarris@gmail.com>2011-10-14 21:51:07 +0200
commit02e7c8b14d53e4b4b5334c6ae64e49c211f56bf1 (patch)
tree5e5961393d7dcbe7307b1f97348db4b0753eb277 /application/config/migration.php
parent5494077cd755effc3204cdba8bfac5bd2d8ad74d (diff)
REALLY fixed merge problem.
Diffstat (limited to 'application/config/migration.php')
-rw-r--r--application/config/migration.php43
1 files changed, 0 insertions, 43 deletions
diff --git a/application/config/migration.php b/application/config/migration.php
index 8f3a2f6c5..3ca47f688 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -1,46 +1,3 @@
-<<<<<<< HEAD:application/config/migration.php
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
-/*
-|--------------------------------------------------------------------------
-| Enable/Disable Migrations
-|--------------------------------------------------------------------------
-|
-| Migrations are disabled by default for security reasons.
-| You should enable migrations whenever you intend to do a schema migration
-| and disable it back when you're done.
-|
-*/
-$config['migration_enabled'] = FALSE;
-
-
-/*
-|--------------------------------------------------------------------------
-| Migrations version
-|--------------------------------------------------------------------------
-|
-| This is used to set migration version that the file system should be on.
-| If you run $this->migration->latest() this is the version that schema will
-| be upgraded / downgraded to.
-|
-*/
-$config['migration_version'] = 0;
-
-
-/*
-|--------------------------------------------------------------------------
-| Migrations Path
-|--------------------------------------------------------------------------
-|
-| Path to your migrations folder.
-| Typically, it will be within your application path.
-| Also, writing permission is required within the migrations path.
-|
-*/
-$config['migration_path'] = APPPATH . 'migrations/';
-
-
-/* End of file migration.php */
-=======
<?php defined('BASEPATH') OR exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------