From 133ab106445a4781162a4e007be4f0c699cec830 Mon Sep 17 00:00:00 2001
From: MoonTestUse1 <crocoman7887@gmail.com>
Date: Wed, 25 Dec 2024 04:03:29 +0600
Subject: [PATCH] Merge remote changes and resolve conflicts

---
 docker-compose.yml               | 1 -
 docker/nginx/conf.d/default.conf | 1 -
 2 files changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 84f583f..8eb314b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,6 @@ services:
     depends_on:
       - frontend
     command: certonly --webroot --webroot-path=/var/www/html --email admin@itformhelp.ru --agree-tos --no-eff-email -d itformhelp.ru -d www.itformhelp.ru
-
 volumes:
   sqlite_data:
   certbot-etc:
diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf
index 206d009..4f8c6c3 100644
--- a/docker/nginx/conf.d/default.conf
+++ b/docker/nginx/conf.d/default.conf
@@ -1,4 +1,3 @@
-# docker/nginx/conf.d/default.conf
 server {
     listen 80;
     listen [::]:80;