fixed failed merge instructions

Author: holycrab13

Dockerfile

@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 # Use a consistent Node.js version across build and release stages
 FROM node:23-slim AS builder
-=======
-FROM docker.io/ubuntu:22.04
->>>>>>> master
 
 # Install Python for node-gyp (required for sqlite3 build)
 RUN apt-get update && apt-get install -y python3 build-essential && \

devenv/docker-compose.yml

@@ -2,14 +2,9 @@
 name: databus_devenv
 services:
   gstore:
-<<<<<<< HEAD
     restart: unless-stopped
     image: dbpedia/gstore:dev
     container_name: databus_devenv_gstore
-=======
-    image: docker.io/dbpedia/gstore:dev
-    container_name: devenv_gstore
->>>>>>> master
     environment: 
       STORAGE_USER: "dba"
       STORAGE_PASS: "everyoneknows"
@@ -31,14 +26,9 @@ services:
       - ./data/index/:/index
       - ../search/servlet-config.yml:/resources/config.yml
   virtuoso:
-<<<<<<< HEAD
     restart: unless-stopped
     image: "openlink/virtuoso-opensource-7:latest"
     container_name: databus_devenv_virtuoso
-=======
-    image: "docker.io/openlink/virtuoso-opensource-7:latest"
-    container_name: devenv_virtuoso
->>>>>>> master
     environment:
       DBA_PASSWORD: "everyoneknows"
       SPARQL_UPDATE: "true"

server/app/api/swagger.yml

@@ -87,16 +87,9 @@ paths:
                   "@graph": [
                     {
                       "@type": "Version",
-<<<<<<< HEAD
                       "@id": "%DATABUS_RESOURCE_BASE_URL%/[YOUR_ACCOUNT_NAME]/test_group/test_artifact/0.0.1",
                       "title": "Test Data",
                       "description": "Test data from the swagger API. This can probably be deleted.",
-=======
-                      "@id": "https://dev.databus.dbpedia.org/<your username>/test_group/test_artifact/2022-02-09",
-                      "hasVersion": "2022-02-09",
-                      "title": "test_group test_artifact",
-                      "description": "version of the test_artifact dataset from DBpedia",
->>>>>>> master
                       "license": "https://dalicc.net/licenselibrary/Apache-2.0",
                       "distribution": [
                         {