From 1830f2fd672587d4b542f573c61fdca1b5a63035 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Tue, 13 Jan 2009 19:01:36 -0800 Subject: [PATCH] Removed build break from oauthrsa merge. --- src/DotNetOpenAuth.vsmdi | 118 +++++++++++---------- .../ChannelElements/SigningBindingElementBase.cs | 1 - 2 files changed, 60 insertions(+), 59 deletions(-) diff --git a/src/DotNetOpenAuth.vsmdi b/src/DotNetOpenAuth.vsmdi index 30875ec..6243cb6 100644 --- a/src/DotNetOpenAuth.vsmdi +++ b/src/DotNetOpenAuth.vsmdi @@ -10,28 +10,28 @@ + + - + - + + - - + - - @@ -42,15 +42,16 @@ - + + - + @@ -62,21 +63,22 @@ + - + - - + + @@ -85,7 +87,6 @@ - @@ -102,10 +103,10 @@ - - + + @@ -113,10 +114,10 @@ - + + - @@ -127,19 +128,18 @@ - - + - - + - + + - + @@ -168,33 +168,33 @@ - - + + - - + + - + - + @@ -214,15 +214,13 @@ - + - - + - @@ -235,9 +233,8 @@ - - + @@ -250,32 +247,34 @@ + - + - + - + - + - + + @@ -286,22 +285,24 @@ + - + - + - + - - + + + - + @@ -309,31 +310,32 @@ - + - + - - + + + - - + + - + - + - + @@ -343,8 +345,8 @@ - - + + @@ -352,8 +354,8 @@ - - + + diff --git a/src/DotNetOpenAuth/OAuth/ChannelElements/SigningBindingElementBase.cs b/src/DotNetOpenAuth/OAuth/ChannelElements/SigningBindingElementBase.cs index bf84a1d..6607162 100644 --- a/src/DotNetOpenAuth/OAuth/ChannelElements/SigningBindingElementBase.cs +++ b/src/DotNetOpenAuth/OAuth/ChannelElements/SigningBindingElementBase.cs @@ -1,4 +1,3 @@ -<<<<<<< HEAD:src/DotNetOpenAuth/OAuth/ChannelElements/SigningBindingElementBase.cs //----------------------------------------------------------------------- // // Copyright (c) Andrew Arnott. All rights reserved. -- 2.11.4.GIT