← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/no-expr-serialization into lp:zorba

To: mp+104856@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Tue, 22 May 2012 08:46:25 -0000
In-reply-to: <20120506144023.5654.55822.launchpad@ackee.canonical.com>
Reply-to: mp+104856@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/runtime/full_text/pregenerated/ft_module.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/no-expr-serialization/+merge/104856
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/no-expr-serialization into lp:zorba
From: Markos Zaharioudakis, 2012-05-06