chore: fix merge conflicts

Signed-off-by: Tyler Gillson <[email protected]>
spectrocloud · Jun 11, 2024 · 3e9a2d0 · 3e9a2d0
1 parent ac574f8
commit 3e9a2d0
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Earthfile b/Earthfile
@@ -10,13 +10,8 @@ ARG KAIROS_BASE_IMAGE_URL=gcr.io/spectro-images-public
 ARG ETCD_REPO=https://github.com/etcd-io
 FROM $SPECTRO_PUB_REPO/canvos/alpine-cert:v1.0.0
 
-<<<<<<< HEAD
 # Spectro Cloud and Kairos tags.
-ARG PE_VERSION=v4.4.0
-=======
-## Spectro Cloud and Kairos Tags ##
 ARG PE_VERSION=v4.4.1
->>>>>>> main
 ARG SPECTRO_LUET_VERSION=v1.3.1
 ARG KAIROS_VERSION=v3.0.11
 ARG K3S_FLAVOR_TAG=k3s1