← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module

To: mp+120438@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Thu, 14 Feb 2013 03:08:20 -0000
In-reply-to: <20120820173543.20831.69333.launchpad@ackee.canonical.com>
Reply-to: mp+120438@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Attempt to merge into lp:zorba/archive-module failed due to conflicts: 

text conflict in src/archive_module.xq.src/archive_module.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/archive-module-winfixes/+merge/120438
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.

References

[Merge] lp:~zorba-coders/zorba/archive-module-winfixes into lp:zorba/archive-module
From: Juan Zacarias, 2012-08-20