chore: Resolve Merge Conflicts from sln to slnx migration

Author: DevTKSS

AspNet.Security.OAuth.Providers.slnx

@@ -39,6 +39,9 @@
     <File Path=".vscode/launch.json" />
     <File Path=".vscode/tasks.json" />
   </Folder>
+  <Folder Name="/Solution Items/docs/assets/">
+    <File Path="docs/assets/Etsy-find-your-client_id.png" />
+  </Folder>
   <Folder Name="/Solution Items/docs/">
     <File Path="docs/amazon.md" />
     <File Path="docs/amocrm.md" />
@@ -49,6 +52,7 @@
     <File Path="docs/docusign.md" />
     <File Path="docs/dropbox.md" />
     <File Path="docs/ebay.md" />
+    <File Path="docs/etsy.md" />
     <File Path="docs/eveonline.md" />
     <File Path="docs/foursquare.md" />
     <File Path="docs/gitcode.md" />
@@ -120,6 +124,7 @@
     <Project Path="src/AspNet.Security.OAuth.Docusign/AspNet.Security.OAuth.Docusign.csproj" />
     <Project Path="src/AspNet.Security.OAuth.Dropbox/AspNet.Security.OAuth.Dropbox.csproj" />
     <Project Path="src/AspNet.Security.OAuth.Ebay/AspNet.Security.OAuth.Ebay.csproj" />
+    <Project Path="src/AspNet.Security.OAuth.Etsy/AspNet.Security.OAuth.Etsy.csproj" />
     <Project Path="src/AspNet.Security.OAuth.EVEOnline/AspNet.Security.OAuth.EVEOnline.csproj" />
     <Project Path="src/AspNet.Security.OAuth.ExactOnline/AspNet.Security.OAuth.ExactOnline.csproj" />
     <Project Path="src/AspNet.Security.OAuth.Feishu/AspNet.Security.OAuth.Feishu.csproj" />