From 71b917ace60df8f5845dfc42cce1e4e6d529c858 Mon Sep 17 00:00:00 2001 From: David Monllao Date: Tue, 1 Aug 2017 10:03:31 +0200 Subject: [PATCH] MDL-53492 hub: Fix remaining conflict --- lib/db/upgrade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 575f04e63d6..36d4845fca0 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -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');