From 7ba6fbabc18bf86f20020abeaee1e962175bcb80 Mon Sep 17 00:00:00 2001
From: Christian Galo <christian.galo@outlook.com>
Date: Sat, 18 Apr 2026 06:12:27 +0000
Subject: [PATCH] Resolve merge conflict and bump app image

---
 compose.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index 9088a29..39c9dfd 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -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"