aboutsummaryrefslogtreecommitdiff
path: root/.vscode
diff options
context:
space:
mode:
authorWBoerenkamps <wrj.boerenkamps@student.avans.nl>2024-10-25 21:14:09 +0200
committerWBoerenkamps <wrj.boerenkamps@student.avans.nl>2024-10-25 21:14:09 +0200
commit26bb39991aaebe3b7ef8869f217db490143bc0e6 (patch)
treee3ec5530e298257ef347f996f0a2c5a150d099f7 /.vscode
parent15a4c4a1cf67e13be53ef423c51c56488f332ea9 (diff)
merge conflicts fixed
Diffstat (limited to '.vscode')
-rw-r--r--.vscode/settings.json6
1 files changed, 5 insertions, 1 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 936b057..1ea4738 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -62,6 +62,10 @@
"cinttypes": "cpp",
"typeinfo": "cpp",
"valarray": "cpp",
- "variant": "cpp"
+ "variant": "cpp",
+ "forward_list": "cpp",
+ "codecvt": "cpp",
+ "fstream": "cpp",
+ "typeindex": "cpp"
}
}