Fix vscode workspace and settings files from rebase.

libbitcoin · Oct 31, 2024 · aef7f62 · aef7f62
1 parent 3f906b4
commit aef7f62
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
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.)
 }