From 57bfac07c199414df8422393f73e04647c2d8069 Mon Sep 17 00:00:00 2001
From: David Ko <dko@suse.com>
Date: Mon, 17 Jun 2024 20:35:50 +0800
Subject: [PATCH] Update Dockerfile.dapper

Signed-off-by: David Ko <dko@suse.com>
---
 Dockerfile.dapper | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 23a7a9e8..b2da3cea 100644
--- 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