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 ChangeLog
text conflict in src/compiler/rewriter/rules/fold_rules.cpp
text conflict in src/runtime/core/path_iterators.cpp
text conflict in src/runtime/json/jsoniq_functions_impl.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/count-opt/+merge/148586
Your team Zorba Coders is subscribed to branch lp:zorba.