Merge error

0xPolygon · Aug 8, 2024 · 0e0692f · 0e0692f
1 parent 399d595
commit 0e0692f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,6 @@
-<<<<<<< HEAD
 **/.DS_Store
 .vscode
 .env
 /dist/
 cmd/__debug_bin
-=======
 /target
->>>>>>> 45ebd72 (Scaffold command)
diff --git a/crates/cdk/src/main.rs b/crates/cdk/src/main.rs
@@ -56,7 +56,7 @@ pub fn node(config_path: PathBuf) -> anyhow::Result<()> {
         bin_path = format!("{}/../../{}", bin_path, CDK_CLIENT_PATH);
     }
 
-    // Run the node passing the parsed config values as flags
+    // Run the node passing the config file path as argument
     let mut command = Command::new(bin_path.clone());
     command.args(&["run", "-cfg", config_path.canonicalize()?.to_str().unwrap()]);