Merge pull request #1949 from ChurchCRM/2.6.0-1937-fix-restore-fail

fixes #1937
ChurchCRM · Feb 19, 2017 · f506cf0 · f506cf0
2 parents 378e3e0 + 4a2375d
commit f506cf0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/src/composer.json b/src/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "ChurchCRM/CRM",
-    "version": "2.7.0",
+    "version": "2.6.0",
     "type": "project",
     "keywords": [
         "church",

diff --git a/src/mysql/upgrade.json b/src/mysql/upgrade.json
@@ -93,25 +93,17 @@
         "scripts": [
             "/mysql/upgrade/2.5.0.sql"
         ],
-        "dbVersion":"2.5.0"
-    },
-    "pre-2.6.0": {
-        "versions": [
-          "2.5.0",
-          "2.5.1",
-          "2.5.2"
-        ],
-        "scripts":[
-          "/mysql/upgrade/2.6.0.sql"
-        ],
-        "dbVersion": "2.6.0"
+        "dbVersion": "2.5.0"
     },
     "current": {
         "versions": [
-          "2.6.0"
+            "2.5.0",
+            "2.5.1",
+            "2.5.2"
         ],
-        "scripts":[
+        "scripts": [
+            "/mysql/upgrade/2.6.0.sql"
         ],
-        "dbVersion": "2.7.0"
+        "dbVersion": "2.6.0"
     }
-}
+}