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/context/static_context.h
text conflict in src/runtime/collections/collections_impl.cpp
text conflict in src/system/globalenv.cpp
-- 
https://code.launchpad.net/~ceejatec/zorba/feature-thesaurus-uriresolver/+merge/81664
Your team Zorba Coders is requested to review the proposed merge of lp:~ceejatec/zorba/feature-thesaurus-uriresolver into lp:zorba.