From 5394ef740ef1b8b43b03a6f14ca2bdf875ae5846 Mon Sep 17 00:00:00 2001
From: Shane Jaroch <chown_tee@proton.me>
Date: Tue, 28 Jun 2022 14:15:08 -0400
Subject: [PATCH] fix merge conflict

---
 etc/nginx/sites-available/default | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/etc/nginx/sites-available/default b/etc/nginx/sites-available/default
index bb5ddc2..1cc2851 100644
--- a/etc/nginx/sites-available/default
+++ b/etc/nginx/sites-available/default
@@ -1,7 +1,6 @@
 upstream deveast.linode.poczatek.dev {
   keepalive 100;
-  # server 127.0.0.1:20000;
-  server  127.0.0.1:2368;
+  server 127.0.0.1:20000;
   # server unix:/tmp/sanic.sock;
 }
 
-- 
2.52.0