From 30422cfdd3b200cf91feefc19c8c57df41fbb8e3 Mon Sep 17 00:00:00 2001
From: Daniel Lemire <lemire@gmail.com>
Date: Tue, 13 Jul 2021 09:28:49 -0400
Subject: [PATCH] I am getting tired of conflicts in settings.json. (#1652)

---
 .vscode/settings.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 342714d26..f0fda06bf 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,6 +4,7 @@
         {"column": 120 }
     ],
     "files.trimTrailingWhitespace": true,
+    "C_Cpp.autoAddFileAssociations": false,
     "files.associations": {
         "array": "cpp",
         "iterator": "cpp",
@@ -79,4 +80,4 @@
         "*.ipp": "cpp",
         "*.tcc": "cpp"
     }
-}
\ No newline at end of file
+}