← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+96319@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 07 Mar 2012 13:31:17 -0000
In-reply-to: <20120307103219.28114.48349.launchpad@ackee.canonical.com>
Reply-to: mp+96319@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in ChangeLog
text conflict in test/rbkt/Queries/CMakeLists.txt
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/96319
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Markos Zaharioudakis, 2012-03-07