huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge fixes 

Conflicts:
	src/Microsoft.AspNet.Identity/IdentityOptionsSetup.cs
	test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
This commit is contained in:
Hao Kung 2014-05-06 14:05:12 -07:00
parent de2b0a5fbd ab84228c37
commit 2a6a24097c
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNet.Identity/IdentityOptionsSetup.cs
View File

@ -58,12 +58,4 @@ namespace Microsoft.AspNet.Identity
}
}
}
public static class ConfigExtensions
{
public static T Get<T>(this IConfiguration config, string key)
{
}
}
}

1
test/Microsoft.AspNet.Identity.Test/IdentityOptionsTest.cs
View File

@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.Security.Claims;
using Microsoft.Framework.ConfigurationModel;
using Microsoft.Framework.ConfigurationModel.Sources;
using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.DependencyInjection.Fallback;
using Xunit;