From 80b74762c9dad6c5127115f7146cfdf46ad70ab4 Mon Sep 17 00:00:00 2001 From: David Monllao Date: Mon, 24 Oct 2016 11:16:53 +0800 Subject: [PATCH] DML-53048 forms: Remove conflict resultion remaining bit Change wrong alternative references as well. --- lib/deprecatedlib.php | 1 - .../moodle-form-passwordunmask-debug.js | Bin 349 -> 348 bytes .../yui/src/passwordunmask/js/passwordunmask.js | 2 +- 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php index 93d360c1636..215dff7cccd 100644 --- 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 index 2acf8344c5bc1ff1f8f0b08a476eee56ab044571..ca03271ab8baed3c703fc7bae2239c0a0ceda467 100644 GIT binary patch delta 9 Qcmcc1bcboevx(2k02oaLA^-pY delta 11 Scmcb^beCzuGse=1&&mKGiUpSd diff --git a/lib/form/yui/src/passwordunmask/js/passwordunmask.js b/lib/form/yui/src/passwordunmask/js/passwordunmask.js index e617441070a..9c95b3e915d 100644 --- 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'); }; -- 2.43.0