Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@takara9
takara9 committed May 20, 2024
1 parent c1d9562 commit 8893d25
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions e2e/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
KIND_VERSION = 0.23.0
<<<<<<< HEAD
KUBERNETES_VERSION = 1.29.4
=======
KUBERNETES_VERSION = 1.30.0
>>>>>>> 869a47cb7f9a566786205c3f8b99e7144391c0be
CERT_MANAGER_VERSION = 1.14.5
MYSQL_VERSION = 8.0.37

Expand Down

0 comments on commit 8893d25

Please sign in to comment.