← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+95704@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Tue, 06 Mar 2012 21:08:19 -0000
In-reply-to: <20120302235917.8730.52900.launchpad@ackee.canonical.com>
Reply-to: mp+95704@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in test/unit/staticcollectionmanager.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-945241/+merge/95704
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/bug-945241 into lp:zorba
From: Matthias Brantner, 2012-03-02