MDL-53492 hub: Fix remaining conflict
authorDavid Monllao <davidm@moodle.com>
Tue, 1 Aug 2017 08:03:31 +0000 (10:03 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 1 Aug 2017 08:03:31 +0000 (10:03 +0200)
commit71b917ace60df8f5845dfc42cce1e4e6d529c858
treeaea849ecd33e2e3fc85cf97aa8db0ffc04365f35
parent2c04945c586608aea8394665f7c01e82fd43d2d8
MDL-53492 hub: Fix remaining conflict
lib/db/upgrade.php