I've fixed the conflict in the Changelog. Resubmitting for merging into the trunk.
-- https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/91657 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : [email protected] Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
