← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+92171@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Fri, 22 Jun 2012 14:07:23 -0000
In-reply-to: <20120209004645.11731.35953.launchpad@ackee.canonical.com>
Reply-to: mp+92171@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/runtime/json/pregenerated/jsoniq_functions.cpp
text conflict in src/runtime/json/pregenerated/jsoniq_functions.h
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq/+merge/92171
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/jsoniq into lp:zorba.

References

[Merge] lp:zorba/3.0 into lp:zorba
From: Matthias Brantner, 2012-02-09