From 333ebcec41e3f4f5cea1b63b950027fd3f05c89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20B=C3=A4hler?= <oliverbaehler@hotmail.com>
Date: Thu, 28 Mar 2024 21:17:23 +0100
Subject: [PATCH] feat(deps): bump k8s.io/client-go from 0.28.4 to 0.29.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com>
---
 go.mod | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/go.mod b/go.mod
index ff9ad404..26895934 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,11 @@ require (
 	go.uber.org/zap v1.27.0
 	golang.org/x/sync v0.6.0
 	k8s.io/api v0.29.3
+<<<<<<< HEAD
+	k8s.io/apiextensions-apiserver v0.28.4
+=======
 	k8s.io/apiextensions-apiserver v0.29.3
+>>>>>>> 9c1b9487d98585b04741da658d5e97b94ea439cd
 	k8s.io/apimachinery v0.29.3
 	k8s.io/client-go v0.29.3
 	k8s.io/utils v0.0.0-20240102154912-e7106e64919e