Attempt to merge into lp:zorba failed due to conflicts:
text conflict in doc/zorba/xqdoc/templates/www.functx.com_index.html
text conflict in doc/zorba/xqdoc/templates/www.w3.org_2005_xpath-functions.html
text conflict in doc/zorba/xqdoc/templates/www.w3.org_2005_xpath-functions_math.html
Attempt to merge into lp:zorba failed due to conflicts:
text conflict in doc/zorba/ xqdoc/templates /www.functx. com_index. html xqdoc/templates /www.w3. org_2005_ xpath-functions .html xqdoc/templates /www.w3. org_2005_ xpath-functions _math.html
text conflict in doc/zorba/
text conflict in doc/zorba/