a

euandrelucas · Feb 13, 2024 · 5a8256f · 5a8256f
1 parent 1776b1e
commit 5a8256f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 49 deletions.
diff --git a/default.conf b/default.conf
diff --git a/nginx.conf b/nginx.conf
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-http {
-    limit_req_zone $binary_remote_addr zone=one:10m rate=1r/s;
-    limit_conn_zone $binary_remote_addr zone=conn_limit_per_ip:10m;
-    include /etc/nginx/conf.d/*.conf;
-=======
 server {
     listen 80;
     server_name localhost;
@@ -13,5 +7,4 @@ server {
         index  index.html;
         try_files $uri $uri/ /index.html;
     }
->>>>>>> parent of 4d65766 (set: nginx cache)
-}
+}