← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/couchbase-trunk into lp:zorba

To: mp+135779@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Thu, 10 Jan 2013 01:26:39 -0000
In-reply-to: <20121122212219.2886.47538.launchpad@ackee.canonical.com>
Reply-to: mp+135779@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in ChangeLog
text conflict in modules/ExternalModules.conf
-- 
https://code.launchpad.net/~zorba-coders/zorba/couchbase-trunk/+merge/135779
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/couchbase-trunk into lp:zorba
From: Juan Zacarias, 2012-11-22