zorba-coders team mailing list archive

[Zorba Build Bot <chillery+buildbot@xxxxxxxxx>]

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
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1046561 into lp:zorba.