← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+108304@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Tue, 10 Jul 2012 21:16:17 -0000
In-reply-to: <20120601083818.8638.76480.launchpad@ackee.canonical.com>
Reply-to: mp+108304@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in ChangeLog
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1002993/+merge/108304
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/bug-1002993 into lp:zorba
From: Markos Zaharioudakis, 2012-06-01