No idea what the changes to this file are but it won't stash so here we go.
Careful merge attempt, removing Combres, keeping EFTracingProvider.
removed .gitattribute file with text=auto problem
Commented out reference to EFProvider that's not supported by EF6.
Removed depreciated references to system.data.objects
Replaced depreciated EntityFunctions with DbFunctions
Added a report tab.
Trying to follow ASP.NET Identity creation steps...