Skip to content

Commit 4b78fd0

Browse files
committed
Cherry-pick kube-apiserver 5.1.0
Signed-off-by: Marius <[email protected]>
1 parent 6406d38 commit 4b78fd0

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

docs/release-notes/next.md

-3
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ hide_table_of_contents: true
9595

9696

9797
</details>
98-
<<<<<<< HEAD
99-
=======
10098

10199
<details>
102100
<summary><b>Update networking-cilium to <code>1.40.1</code></b></summary>
@@ -129,4 +127,3 @@ no release notes available
129127
**Full Changelog**: https://github.com/gardener-community/garden-kube-apiserver/compare/5.0.0...5.1.0
130128

131129
</details>
132-
>>>>>>> 9e08f03505 (Update Helm release garden-kube-apiserver to v5.1.0)

0 commit comments

Comments
 (0)