← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+83885@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Thu, 19 Jan 2012 08:40:28 -0000
In-reply-to: <20111130013029.8554.24520.launchpad@ackee.canonical.com>
Reply-to: mp+83885@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/unit_tests/CMakeLists.txt
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-896426/+merge/83885
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/bug-896426 into lp:zorba
From: Paul J. Lucas, 2011-11-30