← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: David Graf <david.graf@xxxxxxxxxx>
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Thu, 27 Sep 2012 06:07:22 -0000
In-reply-to: <20120921100819.16589.35699.launchpad@ackee.canonical.com>
Reply-to: mp+125662@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in ChangeLog
text conflict in src/runtime/xqdoc/xqdoc_impl.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/xqdoc-extensions/+merge/125662
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/xqdoc-extensions into lp:zorba
From: David Graf, 2012-09-21