diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-07-19 20:26:51 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-07-19 20:26:51 -0700 |
| commit | 0cfab05dbcb1449f692e227cb06a103a230c18a9 (patch) | |
| tree | 90fd9911e7ac045d1b3784136e03e4b744d05fac /src/DotNetOpenAuth.Test/OAuth/ConsumerDescription.cs | |
| parent | cc2073706f7d1d3d331883433c0b79028c4eb204 (diff) | |
| parent | e615d3c78021d4326ec1442906576defed1d2aa7 (diff) | |
| download | DotNetOpenAuth-0cfab05dbcb1449f692e227cb06a103a230c18a9.zip DotNetOpenAuth-0cfab05dbcb1449f692e227cb06a103a230c18a9.tar.gz DotNetOpenAuth-0cfab05dbcb1449f692e227cb06a103a230c18a9.tar.bz2 | |
Merge branch 'v3.0' into v3.1
Conflicts:
samples/DotNetOpenAuth.ApplicationBlock/Util.cs
Diffstat (limited to 'src/DotNetOpenAuth.Test/OAuth/ConsumerDescription.cs')
| -rw-r--r-- | src/DotNetOpenAuth.Test/OAuth/ConsumerDescription.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth.Test/OAuth/ConsumerDescription.cs b/src/DotNetOpenAuth.Test/OAuth/ConsumerDescription.cs index 625f416..89105ef 100644 --- a/src/DotNetOpenAuth.Test/OAuth/ConsumerDescription.cs +++ b/src/DotNetOpenAuth.Test/OAuth/ConsumerDescription.cs @@ -4,7 +4,7 @@ // </copyright> //----------------------------------------------------------------------- -namespace DotNetOpenAuth.Test { +namespace DotNetOpenAuth.Test.OAuth { /// <summary> /// Information necessary to initialize a <see cref="Consumer"/>, /// and to tell a <see cref="ServiceProvider"/> about it. |