← 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+101796@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Sat, 14 Apr 2012 06:47:18 -0000
In-reply-to: <20120412190051.6811.13691.launchpad@ackee.canonical.com>
Reply-to: mp+101796@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in ChangeLog
text conflict in src/api/staticcontextimpl.h
text conflict in src/precompiled/stdafx.h
-- 
https://code.launchpad.net/~zorba-coders/zorba/module-schema-tools/+merge/101796
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-12