moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-34933 Fix bad merge (grr)

Browse source
This commit is contained in:
Damyon Wiese 2013-04-23 12:15:17 +08:00
parent b0c4e47499
commit a4fea69fde
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/db/upgrade.php
View file

@ -1990,7 +1990,6 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013040300.01); upgrade_main_savepoint(true, 2013040300.01);
} }
<<<<<<< HEAD
if ($oldversion < 2013041200.00) { if ($oldversion < 2013041200.00) {
// MDL-29877 Some bad restores created grade items with no category information. // MDL-29877 Some bad restores created grade items with no category information.
$sql = "UPDATE {grade_items} $sql = "UPDATE {grade_items}