From d4e5757992ce30d9d39252b43326bae878bdb50a Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Wed, 19 Feb 2014 10:03:37 +0800
Subject: [PATCH] MDL-44118 question engine: Fix bad merge conflict resolution
 (again)

This time for sure (sorry).
---
 lib/db/upgrade.php | 4 ++--
 version.php        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 9cd3df1de4b..3a487cdf96c 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -3055,7 +3055,7 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2014021900.02);
     }
 
-    if ($oldversion < 2014021900.00) {
+    if ($oldversion < 2014021900.03) {
 
         // Define table question_sessions to be dropped.
         $table = new xmldb_table('question_sessions');
@@ -3066,7 +3066,7 @@ function xmldb_main_upgrade($oldversion) {
         }
 
         // Main savepoint reached.
-        upgrade_main_savepoint(true, 2014021900.00);
+        upgrade_main_savepoint(true, 2014021900.03);
     }
 
     return true;
diff --git a/version.php b/version.php
index fb6109e6bd7..408b257fe23 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2014021900.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2014021900.03;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.