modified conflict

2023-11-28 17:23:27 +01:00
parent 71aba5cb37 707ec0e3d1
commit 97ee3b122f
1 changed files with 5 additions and 0 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,11 @@ services:
      - ./volumes/gitea-data:/data
      - /etc/timezone:/etc/timezone:ro
      - /etc/localtime:/etc/localtime:ro
+<<<<<<< HEAD
+=======
+    ports:
+      - "222:22"
+>>>>>>> 707ec0e3d10cb32a00381e517b67422774638027
    depends_on:
      - gitea-mariadb
    networks: