MDL-53492 hub: Fix remaining conflict

2017-08-01 10:03:31 +02:00
parent 2c04945c58
commit 71b917ace6
1 changed files with 0 additions and 1 deletions
@@ -2214,7 +2214,6 @@ function xmldb_main_upgrade($oldversion) {
        upgrade_main_savepoint(true, 2017072000.02);
    }

-<<<<<<< HEAD
    if ($oldversion < 2017072700.01) {
        // Changing nullability of field email on table oauth2_system_account to null.
        $table = new xmldb_table('oauth2_system_account');