Reviewed: https://reviews.mahara.org/5815 Committed: https://git.mahara.org/mahara/mahara/commit/98663059d8a3f12dade160aa3e4816cff8d5f278 Submitter: Robert Lyon ([email protected]) Branch: 15.10_STABLE
commit 98663059d8a3f12dade160aa3e4816cff8d5f278 Author: Aaron Wells <[email protected]> Date: Mon Nov 30 18:24:44 2015 +1300 Revert bad merge changes in tinymce.jquery.js Bug 1521058 behatnotneeded: Covered by existing tests Change-Id: I7f4d2a290375074551f72ce2db731b80cab5c278 (cherry picked from commit c687a52a1dde353ec37db09402e62225a246a5ed) -- You received this bug notification because you are a member of Mahara Contributors, which is subscribed to Mahara. Matching subscriptions: Subscription for all Mahara Contributors -- please ask on #mahara-dev or mahara.org forum before editing or unsubscribing it! https://bugs.launchpad.net/bugs/1521058 Title: Bad merge cruft in htdocs/js/tinymce/tinymce.jquery.js Status in Mahara: Fix Committed Status in Mahara 15.10 series: Fix Committed Status in Mahara 16.04 series: Fix Committed Bug description: Robert noticed that there is a merge conflict ">>>>>" line left over in tinymce.jquery.js. It was apparently introduced in commit 5ba3418499cc419e, one of the bootstrap commits. The merge conflict was later partially cleaned up in commit e0d6f1c67f8ac, but this part was overlooked. Looking closer, it's also apparent that quite a bit of duplicated code from that merge conflict was also left in place. It's unclear whether this has caused any bugs, or which section of TinyMCE would cause this code to be executed. To manage notifications about this bug go to: https://bugs.launchpad.net/mahara/+bug/1521058/+subscriptions _______________________________________________ Mailing list: https://launchpad.net/~mahara-contributors Post to : [email protected] Unsubscribe : https://launchpad.net/~mahara-contributors More help : https://help.launchpad.net/ListHelp
