From 26bb39991aaebe3b7ef8869f217db490143bc0e6 Mon Sep 17 00:00:00 2001
From: WBoerenkamps <wrj.boerenkamps@student.avans.nl>
Date: Fri, 25 Oct 2024 21:14:09 +0200
Subject: merge conflicts fixed

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

(limited to '.vscode/settings.json')

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"
 	}
 }
-- 
cgit v1.2.3