← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/add-exi-module into lp:zorba

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

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

text conflict in modules/ExternalModules.conf
-- 
https://code.launchpad.net/~zorba-coders/zorba/add-exi-module/+merge/105949
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/add-exi-module into lp:zorba
From: Chris Hillery, 2012-05-16