← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~paul-lucas/zorba/bug-980463 into lp:zorba

To: mp+101854@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Fri, 13 Apr 2012 23:17:19 -0000
In-reply-to: <20120413031918.5851.17703.launchpad@ackee.canonical.com>
Reply-to: mp+101854@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/zorbaserialization/class_serializer.h
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-980463/+merge/101854
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~paul-lucas/zorba/bug-980463 into lp:zorba
From: Paul J. Lucas, 2012-04-13