Attempt to merge into lp:zorba/archive-module failed due to conflicts:
text conflict in src/archive_module.xq.src/archive_module.cpp
« Back to merge proposal
Attempt to merge into lp:zorba/archive-module failed due to conflicts:
text conflict in src/archive_ module. xq.src/ archive_ module. cpp