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
« Back to merge proposal
Attempt to merge into lp:zorba failed due to conflicts:
text conflict in ChangeLog staticcontextim pl.h /stdafx. h
text conflict in src/api/
text conflict in src/precompiled