fix merge conflict

diff --git a/etc/nginx/sites-available/default b/etc/nginx/sites-available/default
index bb5ddc2071be3b7a2a2acb288c707f811dc018cd..1cc285128a9b6d8a3d768b65de8aeaa095d74bab 100644 (file)
--- 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;
 }