← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module

To: David Graf <david.graf@xxxxxxxxxx>
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Tue, 06 Nov 2012 11:22:18 -0000
In-reply-to: <20120614092025.27236.52839.launchpad@ackee.canonical.com>
Reply-to: mp+110273@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Attempt to merge into lp:zorba/data-formatting-module failed due to conflicts: 

contents conflict in cmake_modules/FindJNI.cmake
-- 
https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.

References

[Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
From: David Graf, 2012-06-14