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 include/zorba/store_consts.h
text conflict in src/compiler/expression/expr.h
text conflict in src/compiler/expression/flwor_expr.cpp
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/parsetree/parsenodes.cpp
text conflict in src/compiler/translator/translator.cpp
text conflict in src/diagnostics/diagnostic_en.xml
text conflict in src/diagnostics/pregenerated/dict_en.cpp
text conflict in src/runtime/core/path_iterators.cpp
text conflict in src/runtime/core/sequencetypes.cpp
text conflict in src/types/typeimpl.cpp
text conflict in src/types/typeimpl.h
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-deactivated/+merge/105825
Your team Zorba Coders is subscribed to branch lp:zorba.