Code review comment for lp:~zorba-coders/zorba/no_disqus

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

« Back to merge proposal