diff --git a/dbus-top/.vscode/settings.json b/dbus-top/.vscode/settings.json
deleted file mode 100644
index dc4386f..0000000
--- a/dbus-top/.vscode/settings.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "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