FIX: trying to solve merge conflicts on .gitmodules and .vscode

Author: DamienGilliard

.gitmodules

@@ -12,5 +12,5 @@
 	path = deps/boost
 	url = https://github.com/diffCheckOrg/submodule-boost.git
 [submodule "deps/loguru"]
-    path = deps/loguru
-    url = https://github.com/emilk/loguru.git
+	path = deps/loguru
+	url = https://github.com/emilk/loguru.git

.vscode/settings.json

@@ -1,90 +1,56 @@
 {
     "files.associations": {
-        "memory": "cpp",
+        "iostream": "cpp",
+        "string": "cpp",
         "algorithm": "cpp",
-        "any": "cpp",
         "array": "cpp",
         "atomic": "cpp",
         "bit": "cpp",
-        "bitset": "cpp",
         "cctype": "cpp",
-        "cfenv": "cpp",
         "charconv": "cpp",
         "chrono": "cpp",
-        "cinttypes": "cpp",
         "clocale": "cpp",
         "cmath": "cpp",
-        "codecvt": "cpp",
         "compare": "cpp",
-        "complex": "cpp",
         "concepts": "cpp",
-        "condition_variable": "cpp",
-        "coroutine": "cpp",
-        "csetjmp": "cpp",
-        "csignal": "cpp",
-        "cstdarg": "cpp",
         "cstddef": "cpp",
         "cstdint": "cpp",
         "cstdio": "cpp",
         "cstdlib": "cpp",
         "cstring": "cpp",
         "ctime": "cpp",
         "cwchar": "cpp",
-        "cwctype": "cpp",
-        "deque": "cpp",
         "exception": "cpp",
-        "execution": "cpp",
         "filesystem": "cpp",
         "format": "cpp",
         "forward_list": "cpp",
-        "fstream": "cpp",
         "functional": "cpp",
-        "future": "cpp",
         "initializer_list": "cpp",
         "iomanip": "cpp",
         "ios": "cpp",
         "iosfwd": "cpp",
-        "iostream": "cpp",
         "istream": "cpp",
         "iterator": "cpp",
         "limits": "cpp",
         "list": "cpp",
         "locale": "cpp",
         "map": "cpp",
-        "memory_resource": "cpp",
-        "mutex": "cpp",
+        "memory": "cpp",
         "new": "cpp",
-        "numeric": "cpp",
         "optional": "cpp",
         "ostream": "cpp",
-        "queue": "cpp",
-        "random": "cpp",
-        "ranges": "cpp",
         "ratio": "cpp",
-        "regex": "cpp",
-        "scoped_allocator": "cpp",
-        "set": "cpp",
-        "shared_mutex": "cpp",
-        "source_location": "cpp",
-        "span": "cpp",
         "sstream": "cpp",
-        "stack": "cpp",
         "stdexcept": "cpp",
-        "stop_token": "cpp",
         "streambuf": "cpp",
-        "string": "cpp",
-        "strstream": "cpp",
         "system_error": "cpp",
-        "thread": "cpp",
         "tuple": "cpp",
         "type_traits": "cpp",
         "typeindex": "cpp",
         "typeinfo": "cpp",
         "unordered_map": "cpp",
         "unordered_set": "cpp",
         "utility": "cpp",
-        "valarray": "cpp",
-        "variant": "cpp",
         "vector": "cpp",
         "xfacet": "cpp",
         "xhash": "cpp",
@@ -102,6 +68,35 @@
         "xtr1common": "cpp",
         "xtree": "cpp",
         "xutility": "cpp",
+        "any": "cpp",
+        "complex": "cpp",
+        "condition_variable": "cpp",
+        "csignal": "cpp",
+        "cstdarg": "cpp",
+        "deque": "cpp",
+        "execution": "cpp",
+        "fstream": "cpp",
+        "future": "cpp",
+        "mutex": "cpp",
+        "numeric": "cpp",
+        "queue": "cpp",
+        "random": "cpp",
+        "regex": "cpp",
+        "set": "cpp",
+        "span": "cpp",
+        "stop_token": "cpp",
+        "thread": "cpp",
+        "variant": "cpp",
+        "bitset": "cpp",
+        "cfenv": "cpp",
+        "ranges": "cpp",
+        "shared_mutex": "cpp",
+        "source_location": "cpp",
+        "stack": "cpp",
+        "valarray": "cpp",
+        "*.inc": "cpp",
+        "coroutine": "cpp",
+        "resumable": "cpp",
         "*.ipp": "cpp"
     }
 }