fixed conflicts

> Do you also agree with the given object names? (lines 8-31)
?
-- 
https://code.launchpad.net/~googol/openlp/central-settings-place/+merge/149940
Your team OpenLP Core is subscribed to branch lp:openlp.

_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp

Reply via email to