← Back to team overview

zorba-coders team mailing list archive

Thread
Date

Re: [Merge] lp:~zorba-coders/zorba/bug-978722_oauth into lp:zorba/oauth-module

To: mp+101530@xxxxxxxxxxxxxxxxxx
From: Zorba Build Bot <chillery+buildbot@xxxxxxxxx>
Date: Thu, 12 Apr 2012 12:53:24 -0000
In-reply-to: <20120411101320.32416.15506.launchpad@ackee.canonical.com>
Reply-to: mp+101530@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

text conflict in src/com/zorba-xquery/www/modules/oauth/client.xq
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-978722_oauth/+merge/101530
Your team Zorba Coders is subscribed to branch lp:zorba/oauth-module.

References

[Merge] lp:~zorba-coders/zorba/bug-978722_oauth into lp:zorba/oauth-module
From: Matthias Brantner, 2012-04-11