Fixing conflicts

elastic · Nov 1, 2024 · 88d826a · 88d826a
1 parent ecfe455
commit 88d826a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/dev-tools/cloud/terraform/main.tf b/dev-tools/cloud/terraform/main.tf
@@ -4,11 +4,7 @@ terraform {
   required_providers {
     ec = {
       source  = "elastic/ec"
-<<<<<<< HEAD
-      version = "0.9.0"
-=======
       version = "0.12.1"
->>>>>>> daafd1a (Update version of elastic/ec terraform provider to latest (#4087))
     }
   }
 }