← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+150278@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Mon, 25 Feb 2013 11:03:54 -0000
In-reply-to: <20130225092523.29680.45731.launchpad@ackee.canonical.com>
Reply-to: mp+150278@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in test/fots_driver/fots-driver.xq
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos_fots/+merge/150278
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/markos_fots into lp:zorba
From: Markos Zaharioudakis, 2013-02-25