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
« Back to merge proposal
Attempt to merge into lp:zorba failed due to conflicts:
text conflict in src/compiler/ translator/ translator. cpp typeops. cpp
text conflict in src/types/