Fix vscode workspace and settings files from rebase.

evoskuil · evoskuil · commit aef7f62c5fdc · 2024-10-31T12:45:33.000-04:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,10 +1,4 @@
 {
-<<<<<<< HEAD
-    "cmake.sourceDirectory": "/home/nixmini/Repository/Source/libbitcoin-node/builds/cmake",
-    "cmake.useCMakePresets": "always"
-}
-=======
     "cmake.sourceDirectory": "${workspaceFolder}/builds/cmake",
     "cmake.useCMakePresets": "always"
 }
->>>>>>> e3e1a43d (Regenerate artifacts.)
diff --git a/builds/vscode/node.code-workspace b/builds/vscode/node.code-workspace
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
 	"folders": [
 		{
 			"path": "../../../libbitcoin-system"
@@ -13,14 +12,6 @@
 		{
 			"path": "../../../libbitcoin-node"
 		}
-	],
-	"settings": {}
-=======
-    "folders": [
-        {
-	    "path": "../../../libbitcoin-node"
-	}
     ],
     "settings": {}
->>>>>>> e3e1a43d (Regenerate artifacts.)
 }

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,4 @@`
`1`	`1`	`{`
`2`		`-<<<<<<< HEAD`
`3`		`- "cmake.sourceDirectory": "/home/nixmini/Repository/Source/libbitcoin-node/builds/cmake",`
`4`		`- "cmake.useCMakePresets": "always"`
`5`		`-}`
`6`		`-=======`
`7`	`2`	`"cmake.sourceDirectory": "${workspaceFolder}/builds/cmake",`
`8`	`3`	`"cmake.useCMakePresets": "always"`
`9`	`4`	`}`
`10`		`->>>>>>> e3e1a43d (Regenerate artifacts.)`