MDL-56161 boost: fix confict resolution mistake
commitebdd54f476f8ed0849d0a07614a0e742ef3a6752
authorDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 10:20:34 +0000 (2 10:20 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 10:20:34 +0000 (2 10:20 +0000)
treeaefda74aa8c149dedb2337e6fc41f937d33f7992
parente5c726353fc552bf5a4c81877942d32b76278480
MDL-56161 boost: fix confict resolution mistake
theme/boost/templates/core_form/element-template.mustache