Comment 0 for bug 1521058

Robert noticed that there is a merge conflict ">>>>>" line left over in tinymce.jquery.js. It was apparently introduced in commit 3db4ecaf, 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.