fix conflict

cybozu-go · May 20, 2024 · 7f6305a · 7f6305a
2 parents d8a4cad + 869a47c
commit 7f6305a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
@@ -38,8 +38,13 @@ jobs:
  if: steps.list-changed.outputs.changed == 'true'
  with:
  version: v0.23.0
+<<<<<<< HEAD
  node_image: kindest/node:v1.29.4
  kubectl_version: v1.29.4
+=======
+ node_image: kindest/node:v1.30.0
+ kubectl_version: v1.30.0
+>>>>>>> 869a47cb7f9a566786205c3f8b99e7144391c0be
 
  - name: Apply cert-manager
  run: |

diff --git a/e2e/Makefile b/e2e/Makefile
@@ -1,5 +1,9 @@
 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