modified conflict
This commit is contained in:
@@ -20,6 +20,11 @@ services:
|
|||||||
- ./volumes/gitea-data:/data
|
- ./volumes/gitea-data:/data
|
||||||
- /etc/timezone:/etc/timezone:ro
|
- /etc/timezone:/etc/timezone:ro
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
ports:
|
||||||
|
- "222:22"
|
||||||
|
>>>>>>> 707ec0e3d10cb32a00381e517b67422774638027
|
||||||
depends_on:
|
depends_on:
|
||||||
- gitea-mariadb
|
- gitea-mariadb
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
Reference in New Issue
Block a user