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
text conflict in src/functions/func_jsoniq_functions_impl.cpp
contents conflict in src/functions/func_jsoniq_functions_impl.h
text conflict in src/functions/function_consts.h
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/bug-1046561 into lp:zorba.

Mailing list:
Post to     :
Unsubscribe :
More help   :

Reply via email to