Fix conflicts

IIBenII · bberriot · commit 0ac5cf72558e · 2022-12-30T11:21:02.000+01:00
diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl
@@ -38,11 +38,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-<<<<<<< HEAD
       version = ">= 4.46.0, < 5.0"
-=======
-      version = ">= 4.45.0, < 5.0"
->>>>>>> master
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-autopilot-private-cluster/versions.tf b/modules/beta-autopilot-private-cluster/versions.tf
@@ -21,11 +21,7 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-<<<<<<< HEAD
       version = ">= 4.46.0, < 5.0"
-=======
-      version = ">= 4.45.0, < 5.0"
->>>>>>> master
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-autopilot-public-cluster/versions.tf b/modules/beta-autopilot-public-cluster/versions.tf
@@ -21,11 +21,7 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-<<<<<<< HEAD
       version = ">= 4.46.0, < 5.0"
-=======
-      version = ">= 4.45.0, < 5.0"
->>>>>>> master
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
@@ -21,11 +21,7 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-<<<<<<< HEAD
       version = ">= 4.46.0, < 5.0"
-=======
-      version = ">= 4.45.0, < 5.0"
->>>>>>> master
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -21,11 +21,7 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-<<<<<<< HEAD
       version = ">= 4.46.0, < 5.0"
-=======
-      version = ">= 4.45.0, < 5.0"
->>>>>>> master
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-public-cluster-update-variant/versions.tf b/modules/beta-public-cluster-update-variant/versions.tf
@@ -21,11 +21,7 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-<<<<<<< HEAD
       version = ">= 4.46.0, < 5.0"
-=======
-      version = ">= 4.45.0, < 5.0"
->>>>>>> master
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -21,11 +21,7 @@ terraform {
   required_providers {
     google-beta = {
       source  = "hashicorp/google-beta"
-<<<<<<< HEAD
       version = ">= 4.46.0, < 5.0"
-=======
-      version = ">= 4.45.0, < 5.0"
->>>>>>> master
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf
@@ -21,11 +21,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-<<<<<<< HEAD
       version = ">= 4.46.0, < 5.0"
-=======
-      version = ">= 4.45.0, < 5.0"
->>>>>>> master
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf
@@ -21,11 +21,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-<<<<<<< HEAD
       version = ">= 4.46.0, < 5.0"
-=======
-      version = ">= 4.45.0, < 5.0"
->>>>>>> master
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
