conflit de fusion

docker-compose.yml

@@ -385,26 +385,6 @@ services:
        - network
      depends_on:
        - nginx
-  adminassos:
-    hostname: v59
-    container_name: adminassos
-    build:
-      context: .
-      dockerfile: docker/adminassos/Dockerfile
-      args:
-        - OS=${OS}
-    restart: always
-    volumes:
-      - ./apps/opentalent:/var/source/opentalent:cached
-      - useruploaddata:/var/www/opentalent/fileadmin/user_upload:cached
-      - ./apps/vendor:/var/source/vendor:delegated
-      - ./apps/opentalent-config:/var/source/config:cached
-    environment:
-      - VIRTUAL_HOST=${V59_VIRTUAL_HOST}
-    networks:
-      - network
-    depends_on:
-      - nginx
 
   metabase:
     hostname: metabase
@@ -546,4 +526,4 @@ volumes:
   appcache: ~
   applog: ~
   mercure_data: ~
-  mercure_config: ~
+  mercure_config: ~