← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~paul-lucas/zorba/bug-949111 into lp:zorba

To: mp+96392@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 07 Mar 2012 19:02:17 -0000
In-reply-to: <20120307163320.27306.15.launchpad@ackee.canonical.com>
Reply-to: mp+96392@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/store/naive/atomic_items.h
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-949111/+merge/96392
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~paul-lucas/zorba/bug-949111 into lp:zorba
From: Paul J. Lucas, 2012-03-07