← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+121347@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Mon, 10 Sep 2012 10:11:38 -0000
In-reply-to: <20120826202318.13866.72439.launchpad@ackee.canonical.com>
Reply-to: mp+121347@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in ChangeLog
duplicate in src/compiler/parser/xquery_parser.cpp.moved
duplicate in src/compiler/parser/xquery_parser.hpp.moved
duplicate in src/compiler/parser/xquery_scanner.cpp.moved
-- 
https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/bang_operator into lp:zorba
From: William Candillon, 2012-08-26