Accept incoming changes for misc jobs

2023-02-22 10:56:45 +01:00 · 2023-02-22 10:56:45 +01:00 · 596258559c
parent c5a10aaa3c
commit 596258559c
1 changed files with 1 additions and 6 deletions
--- 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",
            ):