From cf857d8951ae7cb695480e144e6b3d32482af077 Mon Sep 17 00:00:00 2001
From: fust <thom.wijtenburg@gmail.com>
Date: Mon, 4 Nov 2024 21:09:10 +0100
Subject: [PATCH] fix: fix linter errors

---
 internal/infoblox/common.go | 3 +--
 pkg/webhook/webhook.go      | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/internal/infoblox/common.go b/internal/infoblox/common.go
index 8cb2ede..fb11a89 100644
--- a/internal/infoblox/common.go
+++ b/internal/infoblox/common.go
@@ -103,7 +103,7 @@ func ToHostResponseMap(res []ibclient.HostRecord) *ResponseMap {
 
 func ToPTRResponseMap(res []ibclient.RecordPTR) *ResponseMap {
 	rm := &ResponseMap{
-		Map:	make(map[string]ResponseDetails),
+		Map:        make(map[string]ResponseDetails),
 		RecordType: ibclient.PtrRecord,
 	}
 	for _, record := range res {
@@ -134,4 +134,3 @@ func (rm *ResponseMap) ToEndpoints() []*endpoint.Endpoint {
 	}
 	return endpoints
 }
-
diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go
index 05c9ad8..eff22ec 100644
--- a/pkg/webhook/webhook.go
+++ b/pkg/webhook/webhook.go
@@ -90,7 +90,11 @@ func (p *Webhook) headerCheck(isContentType bool, w http.ResponseWriter, r *http
 		} else {
 			msg += "an accept header"
 		}
+<<<<<<< HEAD
 		err := errors.New(msg)
+=======
+		err := fmt.Errorf("%s", msg)
+>>>>>>> 61d5f4c (fix: fix linter errors)
 
 		_, writeErr := fmt.Fprint(w, err.Error())
 		if writeErr != nil {