← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba

To: mp+110609@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Fri, 15 Jun 2012 20:19:17 -0000
In-reply-to: <20120615200418.29186.62085.launchpad@ackee.canonical.com>
Reply-to: mp+110609@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

contents conflict in test/unit/static_context.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch2/+merge/110609
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/markos-scratch2 into lp:zorba
From: Markos Zaharioudakis, 2012-06-15