From 8201255a9d6dde4b29a5a539a1d6aeefcbd467df Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Mon, 10 May 2021 00:24:24 +0200
Subject: Update embassy

---
 .vscode/settings.json | 1 +
 1 file changed, 1 insertion(+)

(limited to '.vscode')

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5f40426..953054c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,6 +6,7 @@
   "rust-analyzer.checkOnSave.allTargets": false,
   "rust-analyzer.cargo.loadOutDirsFromCheck": true,
   "rust-analyzer.procMacro.enable": true,
+  "rust-analyzer.assist.importMergeBehavior": "last",
   "files.watcherExclude": {
     "**/.git/objects/**": true,
     "**/.git/subtree-cache/**": true,
-- 
cgit v1.2.3