jameesy

Results 4 comments of jameesy

Hey buddy, There are some merge conflicts here, unfortunately. I believe they revolve around the footer links.

![screenshot 2018-12-10 at 11 07 10](https://user-images.githubusercontent.com/32302360/49728869-ce70cf80-fc6b-11e8-88a8-1074f2ab5e2d.png) Hopefully this screenshot helps visualise what is happening. For context: - The first console.log is the `this._editors` object. - Then a loadash `_.filter` call...

This issue stems from the diff_engine, which adds '\n' to the end of each line of content that can be merged. As the responsible function is seemingly called numerous times,...