Attempt to merge into lp:zorba failed due to conflicts: text conflict in src/functions/pregenerated/func_jsoniq_functions.cpp text conflict in src/functions/pregenerated/func_jsoniq_functions.h text conflict in src/functions/pregenerated/function_enum.h text conflict in src/runtime/json/jsoniq_functions_impl.cpp text conflict in src/runtime/json/pregenerated/jsoniq_functions.cpp text conflict in src/runtime/json/pregenerated/jsoniq_functions.h text conflict in src/runtime/pregenerated/iterator_enum.h text conflict in src/runtime/spec/json/jsoniq_functions.xml text conflict in src/runtime/visitors/pregenerated/planiter_visitor.h text conflict in src/runtime/visitors/pregenerated/printer_visitor.cpp text conflict in src/runtime/visitors/pregenerated/printer_visitor.h -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 Your team Zorba Coders is subscribed to branch 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
