← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/module-schema-tools into lp:zorba

To: mp+102377@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Wed, 18 Apr 2012 06:51:29 -0000
In-reply-to: <20120417192336.10601.21918.launchpad@ackee.canonical.com>
Reply-to: mp+102377@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in cmake_modules/ZorbaModule.cmake
-- 
https://code.launchpad.net/~zorba-coders/zorba/module-schema-tools/+merge/102377
Your team Zorba Coders is subscribed to branch lp:zorba.

References

[Merge] lp:~zorba-coders/zorba/module-schema-tools into lp:zorba
From: Cezar Andrei, 2012-04-17