Merge remote changes and resolve conflicts

2025-08-14 00:25:46 +02:00 · 2024-12-25 04:03:29 +06:00
parent 0517cd2a61
commit 133ab10644
2 changed files with 0 additions and 2 deletions
--- 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;