← Back to team overview

zorba-coders team mailing list archive

Thread
Date

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

To: mp+118727@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Tue, 14 Aug 2012 09:54:18 -0000
In-reply-to: <20120808122820.22711.30399.launchpad@ackee.canonical.com>
Reply-to: mp+118727@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/compiler/translator/translator.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118727
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/bug-899364 into lp:zorba
From: Markos Zaharioudakis, 2012-08-08