From b1f00c57762d7f20afc893e19217c1ff86035e4f Mon Sep 17 00:00:00 2001 From: Ilnur Galiev Date: Mon, 19 Oct 2020 16:20:05 +0300 Subject: [PATCH] fix merge error --- cmd/root.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 64a4d61b..2e8c86b7 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -109,15 +109,9 @@ func init() { rootCmd.PersistentFlags().Bool("metrics", false, "enable metrics") -<<<<<<< HEAD rootCmd.PersistentFlags().Bool("http", false, "enable http service for prometheus") rootCmd.PersistentFlags().String("http-addr", "127.0.0.1", "http host for prometheus") rootCmd.PersistentFlags().String("http-port", "8080", "http port for prometheus") -======= - rootCmd.PersistentFlags().Bool("http", false, "enable http service") - rootCmd.PersistentFlags().String("http-addr", "127.0.0.1", "http host") - rootCmd.PersistentFlags().String("http-port", "8080", "http port") ->>>>>>> efebea7a186d6b78f7808210545f4b3565796934 viper.BindPFlag("logfile", rootCmd.PersistentFlags().Lookup("logfile")) viper.BindPFlag("database.name", rootCmd.PersistentFlags().Lookup("database-name"))