I'll fix the conflicts but Cezar already knows what the issue is and which tests are failing, so basically he knows what needs to be fixed. Solving the conflicts won't solve those bugs and the Changelog will start conflicting again on the next trunk merge. -- https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/139848 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