openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Review: Needs Fixing needs fixing
You have merge conflicts, which means you need to update your local working copy of trunk, and then merge the changes from trunk into your branch, and fix the conflicts.

Then, as you correctly pointed out, you need to make sure you don't change the line endings to Windows.
-- 
https://code.launchpad.net/~phill-ridout/openlp/fixes/+merge/29514
Your team OpenLP Core is subscribed to branch lp:openlp.