From 596258559c519e0679dfa5d7a4607428c3f169aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= <theophile.diot900@gmail.com>
Date: Wed, 22 Feb 2023 10:56:45 +0100
Subject: [PATCH] Accept incoming changes for misc jobs

---
 src/common/core/misc/jobs/default-server-cert.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/common/core/misc/jobs/default-server-cert.py b/src/common/core/misc/jobs/default-server-cert.py
index f8a8d8f1a..f23133b3c 100644
--- a/src/common/core/misc/jobs/default-server-cert.py
+++ b/src/common/core/misc/jobs/default-server-cert.py
@@ -24,13 +24,8 @@ try:
     need_default_cert = False
     if getenv("MULTISITE", "no") == "yes":
         for first_server in getenv("SERVER_NAME", "").split(" "):
-<<<<<<< HEAD
-            for check_var in [
-                "USE_CUSTOM_SSL",
-=======
             for check_var in (
-                "USE_CUSTOM_HTTPS",
->>>>>>> 6bf59b59a25691c6c6dbafc4ffb3051bc1519f34
+                "USE_CUSTOM_SSL",
                 "AUTO_LETS_ENCRYPT",
                 "GENERATE_SELF_SIGNED_SSL",
             ):