← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~danielturcanu/zorba/xqueryx_fulltext into lp:zorba

To: Daniel Turcanu <danielturcanu@xxxxxxxxx>
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 11 Jan 2012 07:54:02 -0000
In-reply-to: <20111228144822.15348.11044.launchpad@ackee.canonical.com>
Reply-to: mp+87018@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in test/rbkt/Queries/CMakeLists.txt
-- 
https://code.launchpad.net/~danielturcanu/zorba/xqueryx_fulltext/+merge/87018
Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/xqueryx_fulltext into lp:zorba.

References

[Merge] lp:~danielturcanu/zorba/xqueryx_fulltext into lp:zorba
From: Daniel Turcanu, 2011-12-28