Fix merge conflicts

1 files changed, 29 insertions, 29 deletions

diff --git a/plyr.code-workspace b/plyr.code-workspace
index bcd26028..733a305d 100644
--- a/plyr.code-workspace
+++ b/plyr.code-workspace
@@ -1,37 +1,37 @@
 {
-    "folders": [
-        {
-            "path": "."
-        }
-    ],
-    "settings": {
-        "search.exclude": {
-            "**/node_modules": true,
-            "**/dist": true
-        },
+  "folders": [
+    {
+      "path": "."
+    }
+  ],
+  "settings": {
+    "search.exclude": {
+      "**/node_modules": true,
+      "**/dist": true
+    },
 
-        // Linting
-        "stylelint.enable": true,
-        "css.validate": false,
-        "scss.validate": false,
-        "javascript.validate.enable": false,
+    // Linting
+    "stylelint.enable": true,
+    "css.validate": false,
+    "scss.validate": false,
+    "javascript.validate.enable": false,
 
-        // Formatting
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.tabSize": 4,
-        "editor.insertSpaces": true,
-        "editor.formatOnSave": true,
+    // Formatting
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.tabSize": 2,
+    "editor.insertSpaces": true,
+    "editor.formatOnSave": true,
 
-        // Trim on save
-        "files.trimTrailingWhitespace": true,
+    // Trim on save
+    "files.trimTrailingWhitespace": true,
 
-        // Special file associations
-        "files.associations": {
-            ".eslintrc": "jsonc"
-        },
+    // Special file associations
+    "files.associations": {
+      ".eslintrc": "jsonc"
+    },
 
-        "editor.codeActionsOnSave": {
-            "source.fixAll": true
-        }
+    "editor.codeActionsOnSave": {
+      "source.fixAll": true
     }
+  }
 }