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/store/naive/item.cpp
text conflict in src/store/naive/pul_primitives.cpp
text conflict in src/store/naive/simple_collection.cpp
text conflict in src/store/naive/simple_pul.cpp
text conflict in src/store/naive/simple_store.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq/+merge/92168
Your team Zorba Coders is requested to review the proposed merge of lp:zorba/3.0 into lp:zorba.