MDL-33465 fix incorrect merge conflict resolution
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 8 Jun 2012 08:55:39 +0000 (10:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 8 Jun 2012 08:55:39 +0000 (10:55 +0200)
commit78117cb1a490227870bf3dd8d90e9a6ecd0f9818
treedc27febaea114886f771d631537408430e581008
parentec3d3ede808993feb61f72e5b7aed3855e2dae8a
MDL-33465 fix incorrect merge conflict resolution
backup/moodle2/restore_stepslib.php