mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

MDL-57471 forms: Removing unresolved conflict line

Browse Source
This commit is contained in:
David Monllao 2016-12-29 08:54:36 +01:00
parent 3655a459b4
commit 125fa61a15
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/upgrade.txt
View File

@ -7,8 +7,6 @@ information provided here is intended especially for developers.
* $mform->init_javascript_enhancement() is deprecated and no longer does anything. Existing uses of smartselect enhancement
should be switched to the searchableselector form element or other solutions.
>>>>>>> MDL-57471 forms: deprecate init_javascript_enhancement()
=== 3.2 ===
* Custom roles with access to any part of site administration that do not use the manager archetype will need