Resolve merge conflict and bump app image

2026-04-18 06:12:27 +00:00
parent 02ad7a1ace
commit 7ba6fbabc1
1 changed files with 0 additions and 4 deletions
@@ -1,10 +1,6 @@
 services:
  app:
-<<<<<<< HEAD
-    image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.39.4-1
-=======
    image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.39.4-2
->>>>>>> b19daf1 (Bump app image and fix healthcheck quoting)
    command: /bin/sh entrypoint.sh
    volumes:
      - "data:/home/node/.wiki"