From a27b6d74f6b1b711b3c5b3d8088057c83be9fdc4 Mon Sep 17 00:00:00 2001 From: Kemal Akkoyun Date: Fri, 13 May 2022 10:59:26 +0200 Subject: [PATCH] Fix conflicts Signed-off-by: Kemal Akkoyun --- prometheus/gen_go_collector_metrics_set.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/prometheus/gen_go_collector_metrics_set.go b/prometheus/gen_go_collector_metrics_set.go index c6c770405..23b2f01b1 100644 --- a/prometheus/gen_go_collector_metrics_set.go +++ b/prometheus/gen_go_collector_metrics_set.go @@ -38,15 +38,8 @@ func main() { log.Fatal("requires Go version (e.g. go1.17) as an argument") } toolVersion := runtime.Version() -<<<<<<< HEAD if majorVersion := toolVersion[:strings.LastIndexByte(toolVersion, '.')]; majorVersion != os.Args[1] { log.Fatalf("using Go version %q but expected Go version %q", majorVersion, os.Args[1]) -======= - mtv := majorVersion(toolVersion) - mv := majorVersion(os.Args[1]) - if mtv != mv { - log.Fatalf("using Go version %q but expected Go version %q", mtv, mv) ->>>>>>> f251146 (prometheus: Fix convention violating names for generated collector metrics (#1048)) } version, err := parseVersion(mv) if err != nil {