openlp-android team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Right made a complete horlix of this request and managed to commit to trunk by accident.
Intelij and bzr are a marriage made in hell!

Lines 11 and 12 are the real change.
Line 10 is to force a difference to get this merge request out!
-- 
https://code.launchpad.net/~trb143/openlp/android_dev/+merge/110695
Your team OpenLP Android Developers is requested to review the proposed merge of lp:~trb143/openlp/android_dev into lp:openlp/android.