← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+102747@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Thu, 19 Apr 2012 19:31:20 -0000
In-reply-to: <20120419192617.6241.16101.launchpad@ackee.canonical.com>
Reply-to: mp+102747@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in bin/zorbacmdproperties_base.h
-- 
https://code.launchpad.net/~zorba-coders/zorba/serializer/+merge/102747
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/serializer into lp:zorba
From: Markos Zaharioudakis, 2012-04-19