mirror of
https://github.com/spf13/cobra
synced 2025-05-06 13:27:26 +00:00
Fixed automated merge - one conflict
This commit is contained in:
parent
c9cb21db45
commit
3ee8c68c6b
1 changed files with 2 additions and 1 deletions
3
cobra/cmd/testdata/root.go.golden
vendored
3
cobra/cmd/testdata/root.go.golden
vendored
|
@ -58,7 +58,8 @@ func Execute() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {Environ = environ.New(VendorName, ApplicationName)
|
func init() {
|
||||||
|
Environ = environ.New(VendorName, ApplicationName)
|
||||||
cobra.OnInitialize(initConfig)
|
cobra.OnInitialize(initConfig)
|
||||||
|
|
||||||
// Here you will define your flags and configuration settings.
|
// Here you will define your flags and configuration settings.
|
||||||
|
|
Loading…
Add table
Reference in a new issue