Attempt to merge into lp:zorba failed due to conflicts:
text conflict in src/compiler/translator/translator.cpp text conflict in test/fots/CMakeLists.txt
« Back to merge proposal
Attempt to merge into lp:zorba failed due to conflicts:
text conflict in src/compiler/ translator/ translator. cpp CMakeLists. txt
text conflict in test/fots/