Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in src/runtime/json/pregenerated/jsoniq_functions.cpp
text conflict in src/runtime/json/pregenerated/jsoniq_functions.h
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq/+merge/92171
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/jsoniq into lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to     : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Reply via email to