diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-01-13 19:01:36 -0800 |
|---|---|---|
| committer | Andrew <andrewarnott@gmail.com> | 2009-01-13 19:01:36 -0800 |
| commit | 1830f2fd672587d4b542f573c61fdca1b5a63035 (patch) | |
| tree | 40613b7a14c7846b65846dd0ebec870f495d2895 /src/DotNetOpenAuth/OAuth/ChannelElements/SigningBindingElementBase.cs | |
| parent | fb5b3770a76d71b3b0968c5bcf24a9fdb3bd2016 (diff) | |
| download | DotNetOpenAuth-1830f2fd672587d4b542f573c61fdca1b5a63035.zip DotNetOpenAuth-1830f2fd672587d4b542f573c61fdca1b5a63035.tar.gz DotNetOpenAuth-1830f2fd672587d4b542f573c61fdca1b5a63035.tar.bz2 | |
Removed build break from oauthrsa merge.
Diffstat (limited to 'src/DotNetOpenAuth/OAuth/ChannelElements/SigningBindingElementBase.cs')
| -rw-r--r-- | src/DotNetOpenAuth/OAuth/ChannelElements/SigningBindingElementBase.cs | 1 |
1 files changed, 0 insertions, 1 deletions
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 file="SigningBindingElementBase.cs" company="Andrew Arnott"> // Copyright (c) Andrew Arnott. All rights reserved. |