MDL-44118 question engine: Fix bad merge conflict resolution
authorDamyon Wiese <damyon@moodle.com>
Wed, 19 Feb 2014 01:35:57 +0000 (09:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 19 Feb 2014 01:35:57 +0000 (09:35 +0800)
commit0d7e83c4e4f2b0cf1b4a870d3fbd4fc8a5a2752c
tree082a9600512d9748d9ac0948d9e709ee5bbc0e9c
parent6071a209fe0a09d40489886381ebc843babbb779
MDL-44118 question engine: Fix bad merge conflict resolution

Version numbers were out of order in upgrade file (my bad).
lib/db/upgrade.php