← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+106287@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Sat, 19 May 2012 17:24:17 -0000
In-reply-to: <20120518000317.18009.81130.launchpad@ackee.canonical.com>
Reply-to: mp+106287@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/feature-transient_maps/+merge/106287
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/feature-transient_maps into lp:zorba
From: Matthias Brantner, 2012-05-18