Zorba

Code review comment for lp:~zorba-coders/zorba/bug-1046561

  1. bug-1046561
  2. Merge into trunk
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

« Back to merge proposal