← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~nbrinza/zorba/bugs into lp:zorba

To: mp+86408@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Thu, 10 May 2012 11:43:17 -0000
In-reply-to: <20111220144029.10290.71291.launchpad@ackee.canonical.com>
Reply-to: mp+86408@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in ChangeLog
text conflict in src/types/typeimpl.cpp
-- 
https://code.launchpad.net/~nbrinza/zorba/bugs/+merge/86408
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~nbrinza/zorba/bugs into lp:zorba
From: Nicolae Brinza, 2011-12-20