From 277c31af587e3847ef8350af8494ad109cc90481 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Fri, 25 Jul 2014 09:52:45 +0200
Subject: [PATCH] [FIX] Merge conflict with development

---
 include/version.inc.php                                   | 2 +-
 ...{0.0.13_to_0.0.14.inc.php => 0.0.14_to_0.0.15.inc.php} | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename upgrade/definitions/{0.0.13_to_0.0.14.inc.php => 0.0.14_to_0.0.15.inc.php} (83%)

diff --git a/include/version.inc.php b/include/version.inc.php
index 46e122fb..1007908c 100644
--- a/include/version.inc.php
+++ b/include/version.inc.php
@@ -2,7 +2,7 @@
 $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
 
 define('MPOS_VERSION', '0.0.4');
-define('DB_VERSION', '0.0.14');
+define('DB_VERSION', '0.0.15');
 define('CONFIG_VERSION', '0.0.8');
 define('HASH_VERSION', 1);
 
diff --git a/upgrade/definitions/0.0.13_to_0.0.14.inc.php b/upgrade/definitions/0.0.14_to_0.0.15.inc.php
similarity index 83%
rename from upgrade/definitions/0.0.13_to_0.0.14.inc.php
rename to upgrade/definitions/0.0.14_to_0.0.15.inc.php
index 7eb6ce21..e1ddc4c7 100644
--- a/upgrade/definitions/0.0.13_to_0.0.14.inc.php
+++ b/upgrade/definitions/0.0.14_to_0.0.15.inc.php
@@ -1,16 +1,16 @@
 <?php
-function run_0014() {
+function run_0015() {
   // Ugly but haven't found a better way
   global $setting, $config, $user, $mysqli, $transaction;
 
   // Version information
-  $db_version_old = '0.0.13';  // What version do we expect
-  $db_version_new = '0.0.14';  // What is the new version we wish to upgrade to
+  $db_version_old = '0.0.14';  // What version do we expect
+  $db_version_new = '0.0.15';  // What is the new version we wish to upgrade to
   $db_version_now = $setting->getValue('DB_VERSION');  // Our actual version installed
 
   // Upgrade specific variables
   $aSql[] = "ALTER TABLE " . $transaction->getTableName() . " CHANGE `amount` `amount` DECIMAL(50,30) NULL DEFAULT '0'";
-  $aSql[] = "UPDATE " . $setting->getTableName() . " SET value = '0.0.14' WHERE name = 'DB_VERSION'";
+  $aSql[] = "UPDATE " . $setting->getTableName() . " SET value = '0.0.15' WHERE name = 'DB_VERSION'";
 
   if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) {
     // Run the upgrade