diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-07-19 20:27:30 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-07-19 20:27:30 -0700 |
| commit | acf57b014c0219133c6ab041edf5c19ce1b6ac20 (patch) | |
| tree | fa4b5cf6a7a95b620e1d1b2efb30abd6eb68a852 /src/DotNetOpenAuth.Test/OAuth/ProtocolTests.cs | |
| parent | 4ad8df0dc687e0d4359026e3737d8cca6412892e (diff) | |
| parent | 0cfab05dbcb1449f692e227cb06a103a230c18a9 (diff) | |
| download | DotNetOpenAuth-acf57b014c0219133c6ab041edf5c19ce1b6ac20.zip DotNetOpenAuth-acf57b014c0219133c6ab041edf5c19ce1b6ac20.tar.gz DotNetOpenAuth-acf57b014c0219133c6ab041edf5c19ce1b6ac20.tar.bz2 | |
Merge branch 'v3.1' into v3.2
Conflicts:
samples/DotNetOpenAuth.ApplicationBlock/Util.cs
Diffstat (limited to 'src/DotNetOpenAuth.Test/OAuth/ProtocolTests.cs')
| -rw-r--r-- | src/DotNetOpenAuth.Test/OAuth/ProtocolTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth.Test/OAuth/ProtocolTests.cs b/src/DotNetOpenAuth.Test/OAuth/ProtocolTests.cs index ce8070b..e60a9e2 100644 --- a/src/DotNetOpenAuth.Test/OAuth/ProtocolTests.cs +++ b/src/DotNetOpenAuth.Test/OAuth/ProtocolTests.cs @@ -4,7 +4,7 @@ // </copyright> //----------------------------------------------------------------------- -namespace DotNetOpenAuth.Test { +namespace DotNetOpenAuth.Test.OAuth { using DotNetOpenAuth.OAuth; using Microsoft.VisualStudio.TestTools.UnitTesting; |