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/jsoniq_parser.cpp
text conflict in src/compiler/parser/jsoniq_parser.hpp
text conflict in src/compiler/parser/jsoniq_scanner.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
-- 
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159267
Your team Zorba Coders is subscribed to branch lp:zorba.