From db46d02ac23b8e0bc2416e197494d3b795b57530 Mon Sep 17 00:00:00 2001
From: Kyle Farris <kylefarris@kylefarris.gotdns.org>
Date: Fri, 14 Oct 2011 15:17:09 -0400
Subject: trying to resolve some merge issues

---
 application/config/migration.php | 82 ++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

(limited to 'application')

diff --git a/application/config/migration.php b/application/config/migration.php
index dba870010..d88554d91 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -1,42 +1,42 @@
-<?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');
+/*
+|--------------------------------------------------------------------------
+| 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 */
 /* Location: ./application/config/migration.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 5494077cd755effc3204cdba8bfac5bd2d8ad74d Mon Sep 17 00:00:00 2001
From: Kyle Farris <kylefarris@gmail.com>
Date: Fri, 14 Oct 2011 16:50:14 -0300
Subject: Fixed merge error.

---
 application/config/migration.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'application')

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
-- 
cgit v1.2.3-24-g4f1b


From 02e7c8b14d53e4b4b5334c6ae64e49c211f56bf1 Mon Sep 17 00:00:00 2001
From: Kyle Farris <kylefarris@gmail.com>
Date: Fri, 14 Oct 2011 16:51:07 -0300
Subject: REALLY fixed merge problem.

---
 application/config/migration.php | 43 ----------------------------------------
 1 file changed, 43 deletions(-)

(limited to 'application')

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');
 /*
 |--------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b