← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+144275@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 23 Jan 2013 16:05:23 -0000
In-reply-to: <20130122110720.3311.52199.launchpad@ackee.canonical.com>
Reply-to: mp+144275@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

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

References

[Merge] lp:~zorba-coders/zorba/fix_bug_1079006 into lp:zorba
From: Sorin Marian Nasoi, 2013-01-22