chore: resolve conflicts

Signed-off-by: Urban Vidovič <urbanfoundit@gmail.com>
Swaylend · Dec 11, 2024 · dba3d1a · dba3d1a
1 parent df9787f
commit dba3d1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -37,5 +37,5 @@
   "[rust]": {
     "editor.defaultFormatter": "rust-lang.rust-analyzer"
   },
-  "sway-lsp.diagnostic.disableLsp": false
+  "sway-lsp.diagnostic.disableLsp": true
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml