← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba

To: mp+105825@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 16 May 2012 13:38:22 -0000
In-reply-to: <20120515143818.29754.94898.launchpad@ackee.canonical.com>
Reply-to: mp+105825@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/store/naive/pul_primitives.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq-deactivated/+merge/105825
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/jsoniq-deactivated into lp:zorba
From: Ghislain Fourny, 2012-05-15