Update Dockerfile.dapper

Signed-off-by: David Ko <[email protected]>
longhorn · Jun 17, 2024 · c823cd5 · c823cd5
1 parent 87546b3
commit c823cd5
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/bci-base:15.5
-=======
 FROM registry.suse.com/bci/golang:1.22
->>>>>>> d1662b2 (ci: use golang bci instead of manual download)
 
 ARG DAPPER_HOST_ARCH
 ARG http_proxy