Fix merge

manti-by · Feb 22, 2024 · 8cfcce0 · 8cfcce0
1 parent 09b8538
commit 8cfcce0
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/config/nginx.conf b/config/nginx.conf
@@ -11,23 +11,14 @@ server {
     http2 on;
 
     server_name www.semkov-gorodok.by;
-<<<<<<< Updated upstream
-    return 301 https://semkov-gorodok.by$request_uri;
-=======
->>>>>>> Stashed changes
 
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
 
-<<<<<<< Updated upstream
     ssl_certificate /etc/letsencrypt/live/semkov-gorodok.by/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/semkov-gorodok.by/privkey.pem;
-=======
-    ssl_certificate /etc/letsencrypt/live/semkov-gorodok.by/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/semkov-gorodok.by/privkey.pem; # managed by Certbot
 
     return 301 https://semkov-gorodok.by$request_uri;
->>>>>>> Stashed changes
 }
 
 server {
@@ -102,11 +93,7 @@ server {
 
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-<<<<<<< Updated upstream
 
-=======
-
->>>>>>> Stashed changes
     ssl_certificate /etc/letsencrypt/live/semkov-gorodok.by/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/semkov-gorodok.by/privkey.pem;
 }