Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog text conflict in modules/com/zorba-xquery/www/modules/xqdoc.xq -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/126382 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
