Fixed automated merge - one conflict

This commit is contained in:
Raphael Tiersch 2018-09-04 22:34:09 +02:00
parent c9cb21db45
commit 3ee8c68c6b

View file

@ -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.