← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba

To: mp+156674@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Tue, 02 Apr 2013 21:30:37 -0000
In-reply-to: <20130402202222.13162.95760.launchpad@ackee.canonical.com>
Reply-to: mp+156674@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in test/fots/CMakeLists.txt
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156674
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
From: Nicolae Brinza, 2013-04-02