diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-03-17 09:04:33 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-03-17 09:04:33 -0700 |
| commit | 7d2200ee506a0b1a70a95644024ddae419dc9b30 (patch) | |
| tree | eb900aa785b1ea9572565e6204944e5be013b572 /src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs | |
| parent | 7c85a55bb9384b590451ad837adbacfcb6de0a44 (diff) | |
| parent | 980693bd2183055c004b92341ac074fc1951dc73 (diff) | |
| download | DotNetOpenAuth-7d2200ee506a0b1a70a95644024ddae419dc9b30.zip DotNetOpenAuth-7d2200ee506a0b1a70a95644024ddae419dc9b30.tar.gz DotNetOpenAuth-7d2200ee506a0b1a70a95644024ddae419dc9b30.tar.bz2 | |
Merge branch 'v3.3' into v3.4
Conflicts:
samples/OpenIdRelyingPartyMvc/Views/User/LoginPopup.aspx
src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs
Diffstat (limited to 'src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs')
| -rw-r--r-- | src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs index 181c023..44a629a 100644 --- a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs +++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs @@ -4,7 +4,7 @@ // </copyright> //----------------------------------------------------------------------- -namespace DotNetOpenAuth.Test.OpenId { +namespace DotNetOpenAuth.Test.OpenId.Extensions { using System.Collections.ObjectModel; using System.Linq; using DotNetOpenAuth.OpenId; |