MDL-34933 Fix bad merge (grr)

2013-04-23 12:15:17 +08:00
parent b0c4e47499
commit a4fea69fde
1 changed files with 0 additions and 1 deletions
@@ -1990,7 +1990,6 @@ function xmldb_main_upgrade($oldversion) {
        upgrade_main_savepoint(true, 2013040300.01);
    }

-<<<<<<< HEAD
    if ($oldversion < 2013041200.00) {
        // MDL-29877 Some bad restores created grade items with no category information.
        $sql = "UPDATE {grade_items}