← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+92113@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Thu, 16 Feb 2012 02:00:23 -0000
In-reply-to: <20120208192118.19011.48975.launchpad@ackee.canonical.com>
Reply-to: mp+92113@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/unit_tests/unit_test_list.h
text conflict in src/unit_tests/unit_tests.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-transcode_streambuf/+merge/92113
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/feature-transcode_streambuf into lp:zorba
From: Matthias Brantner, 2012-02-08