Attempt to merge into lp:zorba failed due to conflicts: text conflict in src/compiler/parser/xquery_parser.cpp text conflict in src/compiler/parser/xquery_parser.hpp text conflict in src/compiler/parser/xquery_scanner.cpp text conflict in src/compiler/translator/translator.cpp -- https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/153199 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

