Review: Needs Information Ok, I did the bzr merge lp:widelands; part. BZR told me:
"Text conflict in campaigns/cconfig 1 conflicts encountered." How can I find out what exactly the conflict is and how I can fix it? -- https://code.launchpad.net/~angreeone/widelands/trunk/+merge/40936 Your team Widelands Developers is requested to review the proposed merge of lp:~angreeone/widelands/trunk into lp:widelands. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
