Update Dockerfile.dapper

harvester · Oct 28, 2024 · 66fb809 · 66fb809
1 parent ab66d76
commit 66fb809
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM registry.suse.com/bci/golang:1.21
-=======
 FROM registry.suse.com/bci/golang:1.22.8
->>>>>>> 61615bb7 (CVE: bump protobuf and x related dependecies)
 
 ARG DAPPER_HOST_ARCH
 ENV ARCH=${DAPPER_HOST_ARCH}