correct Dockerfile.debug

it-at-m · Jul 10, 2024 · a201998 · a201998
1 parent 136c7f1
commit a201998
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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}