MDL-44118 question engine: Fix bad merge conflict resolution (again)
authorDamyon Wiese <damyon@moodle.com>
Wed, 19 Feb 2014 02:03:37 +0000 (10:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 19 Feb 2014 02:03:37 +0000 (10:03 +0800)
This time for sure (sorry).

lib/db/upgrade.php
version.php

index 9cd3df1..3a487cd 100644 (file)
@@ -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;
index fb6109e..408b257 100644 (file)
@@ -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.