Update Dockerfile.dapper

innobead · innobead · commit 57bfac07c199 · 2024-06-17T20:54:05.000+08:00
Signed-off-by: David Ko &lt;dko@suse.com&gt;
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
