reslove conflicts

Signed-off-by: Philip-21 <[email protected]>
hyperledger · Jan 24, 2024 · 587258e · 587258e
1 parent 209e501
commit 587258e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/init.go b/cmd/init.go
@@ -264,6 +264,6 @@ func init() {
 	initCmd.PersistentFlags().StringArrayVar(&initOptions.OrgNames, "org-name", []string{}, "Organization name")
 	initCmd.PersistentFlags().StringArrayVar(&initOptions.NodeNames, "node-name", []string{}, "Node name")
 	initCmd.PersistentFlags().BoolVar(&initOptions.RemoteNodeDeploy, "remote-node-deploy", false, "Enable or disable deployment of FireFly contracts on remote nodes")
-  initCmd.PersistentFlags().StringVarP(&initOptions.CustomPath, "override", "o", "", "copy data from custom path to docker-compose.override.yml")
+	initCmd.PersistentFlags().StringVarP(&initOptions.CustomPath, "override", "o", "", "copy data from custom path to docker-compose.override.yml")
 	rootCmd.AddCommand(initCmd)
 }
diff --git a/pkg/types/options.go b/pkg/types/options.go
@@ -64,7 +64,7 @@ type InitOptions struct {
 	ChaincodeName            string
 	CustomPinSupport         bool
 	RemoteNodeDeploy         bool
-  CustomPath               string
+	CustomPath               string
 }
 
 const IPFSMode = "ipfs_mode"