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

text conflict in ChangeLog
text conflict in src/api/staticcontextimpl.h
text conflict in src/precompiled/stdafx.h
-- 
https://code.launchpad.net/~zorba-coders/zorba/module-schema-tools/+merge/101796
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