← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+103835@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Thu, 03 May 2012 00:30:24 -0000
In-reply-to: <20120427091217.467.60387.launchpad@ackee.canonical.com>
Reply-to: mp+103835@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/store/naive/simple_pul.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-966706/+merge/103835
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/bug-966706 into lp:zorba
From: Matthias Brantner, 2012-04-27