have a look at <<<<<<<< at start of line ========= and >>>>>>>>>>>>>
and read http://doc.bazaar.canonical.com/latest/en/user-reference/conflict-types-help.html -- 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 : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
