← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+80979@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 02 Nov 2011 06:14:23 -0000
In-reply-to: <20111102060824.25017.23249.launchpad@ackee.canonical.com>
Reply-to: mp+80979@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/system/globalenv.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/feature-thesaurus-uriresolver/+merge/80979
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/feature-thesaurus-uriresolver into lp:zorba
From: Chris Hillery, 2011-11-02