diff --git a/.eslintrc.js b/.eslintrc.js
index ac0fc4cc68..6132d75b17 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -74,6 +74,5 @@ module.exports = {
     'operator-assignment': 'off',
     'no-return-assign': 'off',
     'no-useless-concat': 'off',
-	'linebreak-style': 'off',
   }
 }
diff --git a/.gitattributes b/.gitattributes
index 57798ba528..3dff88b1c3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,8 @@
 *	text=auto
+*.js eol=lf
+*.css eol=lf
+*.glsl eol=lf
+*.html eol=lf
+*.md eol=lf
+*.json eol=lf
+*.yml eol=lf