root conflict

Signed-off-by: houdini91 <mdstrauss91@gmail.com>
scribe-security · Jun 25, 2024 · 11b2c17 · 11b2c17
1 parent 691a2b7
commit 11b2c17
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -110,11 +110,8 @@ func rootCmd() *cobra.Command {
 	cobra.CheckErr(viper.BindPFlag("cache_dir", rootCmd.PersistentFlags().Lookup("cache-dir")))
 
 	rootCmd.AddCommand(fetchCmd())
-<<<<<<< suggestion/save-command
 	rootCmd.AddCommand(exportCmd())
-=======
 	rootCmd.AddCommand(listCmd())
->>>>>>> main
 	rootCmd.AddCommand(versionCmd())
 
 	return rootCmd