← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba

To: mp+160990@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 15 May 2013 16:39:25 -0000
In-reply-to: <20130425192625.9256.88016.launchpad@ackee.canonical.com>
Reply-to: mp+160990@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/~zorba-coders/zorba/bug1167400-valType/+merge/160990
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/bug1167400-valType into lp:zorba
From: Cezar Andrei, 2013-04-25