alohaeditor/Aloha-Editor — comment on commit 3c0b93af897187cc570d1c9ea92e912b44170b6e
File: WebContent/core/core.js line 497
By dcneiner:

The results of a merge conflict were committed into the main repo. These lines need to be resolved, and removed.