← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/zorba-for-sqlite into lp:zorba

To: mp+139108@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 09 Jan 2013 23:27:23 -0000
In-reply-to: <20121210222220.11505.75217.launchpad@ackee.canonical.com>
Reply-to: mp+139108@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in ChangeLog
-- 
https://code.launchpad.net/~zorba-coders/zorba/zorba-for-sqlite/+merge/139108
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/zorba-for-sqlite into lp:zorba
From: Luis Rodriguez Gonzalez, 2012-12-10