DML-53048 forms: Remove conflict resultion remaining bit

Change wrong alternative references as well.
moodle · Oct 24, 2016 · 80b7476 · 80b7476
1 parent 8f68e03
commit 80b7476
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
@@ -5620,7 +5620,6 @@ function message_is_user_blocked($recipient, $sender = null) {
 }
 
 /**
-<<<<<<< 919b9dfabd69f71c088f565746c547e6e169a0b7
  * Display logs.
  *
  * @deprecated since 3.2

diff --git a/lib/form/yui/build/moodle-form-passwordunmask/moodle-form-passwordunmask-debug.js b/lib/form/yui/build/moodle-form-passwordunmask/moodle-form-passwordunmask-debug.js
@@ -3,7 +3,7 @@ YUI.add('moodle-form-passwordunmask', function (Y, NAME) {
 M.form = M.form || {};
 M.form.passwordunmask = function() {
     Y.log("The moodle-form-passwordunmask module has been deprecated. " +
-            "Please use the core_forum/passwordunmask amd module instead.", 'moodle-form-passwordunmask', 'warn');
+            "Please use the core_form/passwordunmask amd module instead.", 'moodle-form-passwordunmask', 'warn');
 };
 
 

diff --git a/lib/form/yui/src/passwordunmask/js/passwordunmask.js b/lib/form/yui/src/passwordunmask/js/passwordunmask.js
@@ -1,5 +1,5 @@
 M.form = M.form || {};
 M.form.passwordunmask = function() {
     Y.log("The moodle-form-passwordunmask module has been deprecated. " +
-            "Please use the core_forum/passwordunmask amd module instead.", 'moodle-form-passwordunmask', 'warn');
+            "Please use the core_form/passwordunmask amd module instead.", 'moodle-form-passwordunmask', 'warn');
 };