Update to latest version

compose.fulltextsearch.yml

@@ -29,7 +29,7 @@ services:
         mode: 0600
 
   searchindexer:
-    image: nextcloud:34.0.1-fpm
+    image: nextcloud:34.0.2-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached

compose.yml

@@ -48,7 +48,7 @@ services:
       start_period: 5m
 
   app:
-    image: nextcloud:34.0.1-fpm
+    image: nextcloud:34.0.2-fpm
     depends_on:
       - db
     configs:
@@ -95,11 +95,7 @@ services:
         failure_action: rollback
         order: start-first
       labels:
-<<<<<<< HEAD
-        - "coop-cloud.${STACK_NAME}.version=15.1.0+34.0.1-fpm"
-=======
-        - "coop-cloud.${STACK_NAME}.version=13.1.1+32.0.12-fpm"
->>>>>>> upstream/main
+        - "coop-cloud.${STACK_NAME}.version=15.1.0+34.0.2-fpm"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
         - "backupbot.backup.volumes.redis=false"
@@ -113,11 +109,7 @@ services:
       start_period: 15m
 
   cron:
-<<<<<<< HEAD
-    image: nextcloud:34.0.1-fpm
-=======
-    image: nextcloud:32.0.13-fpm
->>>>>>> upstream/main
+    image: nextcloud:34.0.2-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached