zorba-coders team mailing list archive

[Zorba Build Bot <chillery+buildbot@xxxxxxxxx>]

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

deleting parent in src/runtime/function_item
unversioned parent in src/runtime/function_item
contents conflict in src/runtime/function_item/dynamic_fncall_iterator.cpp
contents conflict in src/runtime/function_item/dynamic_fncall_iterator.h
-- 
https://code.launchpad.net/~zorba-coders/zorba/hof-merge/+merge/155144
Your team Zorba Coders is subscribed to branch lp:zorba.