diff --git a/.editorconfig b/.editorconfig
index 03f782494..e181959dc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,9 +3,7 @@
 # top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file
 [*]
-end_of_line = lf
 insert_final_newline = true
 
 # Matches multiple files with brace expansion notation
@@ -20,4 +18,4 @@ indent_style = tab
 
 # Tab indentation (no size specified)
 [Makefile]
-indent_style = tab
\ No newline at end of file
+indent_style = tab
diff --git a/.gitattributes b/.gitattributes
index c89cdbf70..1202f6415 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,7 +20,3 @@
 *.css text
 *.js text
 *.types text
-
-*.vcproj text merge=union
-*.csproj text merge=union
-*.sln text merge=union eol=crlf