modified conflict

.gitignore

@@ -1,5 +1,5 @@
 # Ignore everything in the volume folder
-volume/*
+volumes/*
 
 # But not the .gitkeep file
-!volume/.gitkeep
+!volume/.gitkeep

docker-compose.yml

@@ -12,21 +12,25 @@ services:
       - GITEA__database__NAME=gitea
       - GITEA__database__USER=gitea
       - GITEA__database__PASSWD=A68nMCsvzyvueYwE
-      - SSH_DOMAIN=git.zinomedia.de
+      - SSH_DOMAIN=ssh.git.zinomedia.de
       - ROOT_URL=https://git.zinomedia.de
-      - SSH_PORT=222
       - SSH_LISTEN_PORT=22
     restart: "unless-stopped"
     volumes:
       - ./volumes/gitea-data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+<<<<<<< HEAD
+=======
     ports:
       - "222:22"
+>>>>>>> 707ec0e3d10cb32a00381e517b67422774638027
     depends_on:
       - gitea-mariadb
     networks:
       - web
+    ports:
+      - "222:22"
 
   gitea-mariadb:
     image: linuxserver/mariadb:latest
@@ -46,3 +50,4 @@ networks:
   web:
     external: true
     name: web
+