resolve conflict

This commit is contained in:
Jerrie Pelser
2015-05-02 21:26:31 +07:00

View File

@@ -15,6 +15,7 @@ Provides a set of extra authentication providers for OWIN ([Project Katana](http
- Battle.net
- Asana
- Visual Studio Online
- Twitch.tv
- OpenID
- Generic OpenID 2.0 provider
- Steam