diff --git a/dbus-top/.vscode/settings.json b/dbus-top/.vscode/settings.json
new file mode 100644
index 0000000..dc4386f
--- /dev/null
+++ b/dbus-top/.vscode/settings.json
@@ -0,0 +1,13 @@
+{
+    "C_Cpp.errorSquiggles": "Disabled",
+    "files.associations": {
+        "filesystem": "cpp",
+        "*.ipp": "cpp",
+<<<<<<< HEAD
+        "iosfwd": "cpp",
+        "thread": "cpp"
+=======
+        "iosfwd": "cpp"
+>>>>>>> cf7590f (Revert "dbus-top: WIP of all currently-implemented features")
+    }
+}
\ No newline at end of file