diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2011-06-27 06:33:04 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2011-06-27 06:33:04 -0700 |
| commit | d292f3c42ad8f209d6a67b872c1a1dff18e45d43 (patch) | |
| tree | 2893562ab2b20c16ee0f043fa6e7da210e5a013e | |
| parent | 1498e4d316838850cbfc40628c70b20b108e340b (diff) | |
| download | DotNetOpenAuth-d292f3c42ad8f209d6a67b872c1a1dff18e45d43.zip DotNetOpenAuth-d292f3c42ad8f209d6a67b872c1a1dff18e45d43.tar.gz DotNetOpenAuth-d292f3c42ad8f209d6a67b872c1a1dff18e45d43.tar.bz2 | |
Fixed bad merge.
| -rw-r--r-- | samples/OAuthClient/GoogleApps2Legged.aspx (renamed from samples/OAuthConsumer/GoogleApps2Legged.aspx) | 0 | ||||
| -rw-r--r-- | samples/OAuthClient/GoogleApps2Legged.aspx.cs (renamed from samples/OAuthConsumer/GoogleApps2Legged.aspx.cs) | 0 | ||||
| -rw-r--r-- | samples/OAuthClient/GoogleApps2Legged.aspx.designer.cs (renamed from samples/OAuthConsumer/GoogleApps2Legged.aspx.designer.cs) | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/samples/OAuthConsumer/GoogleApps2Legged.aspx b/samples/OAuthClient/GoogleApps2Legged.aspx index cd9d9a1..cd9d9a1 100644 --- a/samples/OAuthConsumer/GoogleApps2Legged.aspx +++ b/samples/OAuthClient/GoogleApps2Legged.aspx diff --git a/samples/OAuthConsumer/GoogleApps2Legged.aspx.cs b/samples/OAuthClient/GoogleApps2Legged.aspx.cs index afb156b..afb156b 100644 --- a/samples/OAuthConsumer/GoogleApps2Legged.aspx.cs +++ b/samples/OAuthClient/GoogleApps2Legged.aspx.cs diff --git a/samples/OAuthConsumer/GoogleApps2Legged.aspx.designer.cs b/samples/OAuthClient/GoogleApps2Legged.aspx.designer.cs index f952937..f952937 100644 --- a/samples/OAuthConsumer/GoogleApps2Legged.aspx.designer.cs +++ b/samples/OAuthClient/GoogleApps2Legged.aspx.designer.cs |