After rebase

2022-10-05 22:10:22 -04:00
parent c472192257
commit d724a63144
4 changed files with 32 additions and 37 deletions
--- a/cmd/urfave-cli-genflags/generated.gotmpl
+++ b/cmd/urfave-cli-genflags/generated.gotmpl
@@ -17,11 +17,7 @@ type {{.TypeName}} struct {
  HasBeenSet bool

  Value {{if .ValuePointer}}*{{end}}{{.GoType}}
-<<<<<<< HEAD:cmd/urfave-cli-genflags/generated.gotmpl
  Destination {{if .NoDestinationPointer}}{{else}}*{{end}}{{.GoType}}
-=======
-  Destination {{if .DestinationPointer}}*{{end}}{{.GoType}}
->>>>>>> Add DestinationPointer for flags generator:internal/genflags/generated.gotmpl

  Aliases []string
  EnvVars []string