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

text conflict in src/compiler/translator/translator.cpp
text conflict in src/types/typeops.cpp
-- 
https://code.launchpad.net/~nbrinza/zorba/hof/+merge/144533
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

Reply via email to