diff --git a/.gitattributes b/.gitattributes
index 8ef1e49..1b5afb3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
 ###############################################################################
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
-*           text=auto
+* text=auto eol=lf
 
 # Shell scripts should always use line feed not crlf
 *.sh text eol=lf
diff --git a/.vscode/settings.json b/.vscode/settings.json
index cabb8c4..cd24716 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,6 @@
 {
     "eslint.alwaysShowStatus": true,
-    "eslint.autoFixOnSave": true
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true
+    }
 }
\ No newline at end of file