From e589fe1c9c865bd17d09edb69d3036c33c88c2ee Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 17 Feb 2016 15:46:23 +0000
Subject: [PATCH] trying to fix merge

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

diff --git a/application/config/migration.php b/application/config/migration.php
index 1e1b1c54..71ecf7ba 100644
--- 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;
 
 
 /*