Attempt to merge into lp:zorba failed due to conflicts:
text conflict in ChangeLog text conflict in modules/com/zorba-xquery/www/modules/xqdoc.xq
« Back to merge proposal
Attempt to merge into lp:zorba failed due to conflicts:
text conflict in ChangeLog com/zorba- xquery/ www/modules/ xqdoc.xq
text conflict in modules/