MDL-44118 question engine: Fix bad merge conflict resolution (again)
authorDamyon Wiese <damyon@moodle.com>
Wed, 19 Feb 2014 02:03:37 +0000 (10:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 19 Feb 2014 02:03:37 +0000 (10:03 +0800)
commitd4e5757992ce30d9d39252b43326bae878bdb50a
tree327b4f6a51c17c70e0626bb0a32c0f06a1fd1ca5
parent0d7e83c4e4f2b0cf1b4a870d3fbd4fc8a5a2752c
MDL-44118 question engine: Fix bad merge conflict resolution (again)

This time for sure (sorry).
lib/db/upgrade.php
version.php