From 052810d13a998e07ecc374ad3ebafa0a41d5888f Mon Sep 17 00:00:00 2001
From: bmen <bastian@bmen.cc>
Date: Sun, 20 Sep 2020 09:52:05 +0000
Subject: [PATCH] =?UTF-8?q?Mergekonflikt=20gel=C3=B6st?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 851e00f..fa3a657 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - PGID=1000
       - TZ=Europe/Berlin
       - URL=bmen.cc
-      - SUBDOMAINS=www,git,cloud,md
+      - SUBDOMAINS=www,git,cloud,cockpit,2032er,md
       - VALIDATION=http
       - EMAIL=webmaster@bmen.cc
       - DHLEVEL=2048