Yes, you have a conflict: "Text conflict in documentation/manual/source/glossary.rst"
Before you start working on something new, you should update trunk and merge it in your branch: ~/Projekte/openlp/trunk$ bzr update ~/Projekte/openlp/trunk$ cd ../trivial/ ~/Projekte/openlp/trivial$ bzr merge ../trunk/ ~/Projekte/openlp/trivial$ bzr commit -m "head" -- https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/42270 Your team OpenLP Core is requested to review the proposed merge of lp:~wesleystout/openlp/documentation into 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
