← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~danielturcanu/zorba/plan-serializer into lp:zorba

To: Daniel Turcanu <danielturcanu@xxxxxxxxx>
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 12 Oct 2011 17:56:24 -0000
In-reply-to: <20111012175417.32305.92548.launchpad@ackee.canonical.com>
Reply-to: mp+79160@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in ChangeLog
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79160
Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/plan-serializer into lp:zorba.

References

[Merge] lp:~danielturcanu/zorba/plan-serializer into lp:zorba
From: Daniel Turcanu, 2011-10-12