chore: update file(s) from sync-files

prom-client-net · Jan 3, 2021 · add5e1b · add5e1b
1 parent 541f6a4
commit add5e1b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,8 +1,3 @@
-# EditorConfig is awesome: http://EditorConfig.org
-# Based on: https://github.com/dotnet/roslyn/blob/master/.editorconfig
-# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
-# https://www.jetbrains.com/help/rider/Using_EditorConfig.html?Wave=183
-
 root = true
 
 [*]

diff --git a/.gitattributes b/.gitattributes
@@ -1,7 +1 @@
-# Auto detect text files and perform LF normalization
 * text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union