← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba

To: mp+126382@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Thu, 27 Sep 2012 15:26:35 -0000
In-reply-to: <20120926060825.10336.27527.launchpad@ackee.canonical.com>
Reply-to: mp+126382@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

References

[Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
From: William Candillon, 2012-09-26