From d1209e6c239a8787cac52a3a33edb275aa4ab7cb Mon Sep 17 00:00:00 2001
From: gesang <gesang@itinerariummentis.org>
Date: Mon, 15 Jul 2024 08:50:18 +0000
Subject: Fix merge issue

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

(limited to 'docker-compose.yaml')

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 845c69b..8c2d7c7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,17 +6,11 @@ services:
     image: luuul/4get:latest
     restart: unless-stopped
     environment:
-<<<<<<< HEAD
       - FOURGET_VERSION=6
       - FOURGET_SERVER_NAME=4get.itinerariummentis.org
-=======
-      - FOURGET_SERVER_NAME=4get.ca
->>>>>>> 0b68d6b2a9928d1b9dae389fbf5b95056e678be0
-
     ports:
       - "80:80"
       - "443:443"
-
     volumes:
       - /etc/letsencrypt/live/domain.tld:/etc/4get/certs
       # mount custom banners and captcha
-- 
cgit v1.2.3