← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba

To: mp+114003@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 11 Jul 2012 00:46:18 -0000
In-reply-to: <20120709163623.8016.59392.launchpad@ackee.canonical.com>
Reply-to: mp+114003@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/compiler/parser/xquery_scanner.cpp
-- 
https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/114003
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~nbrinza/zorba/error-messages into lp:zorba
From: Nicolae Brinza, 2012-07-09