From a201998539f121257a70083b9f3860ddc4c1f870 Mon Sep 17 00:00:00 2001
From: Martin Bayr <ex.bayr@muenchen.de>
Date: Wed, 10 Jul 2024 13:30:44 +0200
Subject: [PATCH] correct Dockerfile.debug

---
 sddi-urban/Dockerfile.debug | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sddi-urban/Dockerfile.debug b/sddi-urban/Dockerfile.debug
index 9e460c1..75074db 100644
--- a/sddi-urban/Dockerfile.debug
+++ b/sddi-urban/Dockerfile.debug
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
 ARG BASEIMAGE_REPOSITORY=ghcr.io/it-at-m/ckan-sddi-urban
-ARG BASEIMAGE_VERSION=edge-2.9.9-dev
-=======
-ARG BASEIMAGE_REPOSITORY=ghcr.io/tum-gis/ckan-sddi-urban
-ARG BASEIMAGE_VERSION=edge-2.9.9
->>>>>>> b3519d32a68b10f164e74aa129fef24d0ab4cabe
+ARG BASEIMAGE_VERSION=udp-katalog-1.1.6-dev
 
 FROM ${BASEIMAGE_REPOSITORY}:${BASEIMAGE_VERSION}