zorba-coders team mailing list archive

[Zorba Build Bot <chillery+buildbot@xxxxxxxxx>]

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
-- 
https://code.launchpad.net/~zorba-coders/zorba/no_disqus/+merge/114793
Your team Zorba Coders is subscribed to branch lp:zorba.