As a quick note: The <<<<<< TREE stuff is not actually in the branch. That's how Launchpad displays diffs here on the website when there is a merge conflict. -- https://code.launchpad.net/~zorba-coders/zorba/bug1073175/+merge/144762 Your team Zorba Coders is subscribed to branch lp:zorba.
-- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
