Merge branch 'develop' into fix/5230

jcnelson · web-flow · commit 9658ffa70fbb · 2024-09-24T17:37:59.000Z
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,7 @@
 {
     "lldb.adapterType": "native",
-    "lldb.launch.sourceLanguages": ["rust"]
+    "lldb.launch.sourceLanguages": ["rust"],
+    "rust-analyzer.runnables.extraEnv": {
+        "BITCOIND_TEST": "1"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"lldb.adapterType": "native",`
`3`		`- "lldb.launch.sourceLanguages": ["rust"]`
	`3`	`+ "lldb.launch.sourceLanguages": ["rust"],`
	`4`	`+ "rust-analyzer.runnables.extraEnv": {`
	`5`	`+ "BITCOIND_TEST": "1"`
	`6`	`+ }`
`4`	`7`	`}`