← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+155656@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 27 Mar 2013 04:12:21 -0000
In-reply-to: <20130327041025.10618.81718.launchpad@ackee.canonical.com>
Reply-to: mp+155656@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

missing parent in src/runtime/function_item
unversioned parent in src/runtime/function_item
contents conflict in src/runtime/function_item/dynamic_fncall_iterator.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/msb-misc/+merge/155656
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/msb-misc into lp:zorba
From: Matthias Brantner, 2013-03-27