fix: merge conflict...

systemphil · Jul 8, 2024 · 7c1c5f1 · 7c1c5f1
2 parents 39cb69a + 1bdad39
commit 7c1c5f1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,6 +9,7 @@
         "Filip",
         "Georg",
         "Guyer",
+        "Houlgate",
         "itselfness",
         "Keon",
         "mindmap",