mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-44118 question engine: Fix bad merge conflict resolution (again)

Browse Source 
This time for sure (sorry).
This commit is contained in:
Damyon Wiese 2014-02-19 10:03:37 +08:00
parent 0d7e83c4e4
commit d4e5757992
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/db/upgrade.php
View 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;

2
version.php
View 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.