Easier to deploy by avoiding merge conflicts in production

nginx/default.conf

@@ -1,22 +0,0 @@
-upstream web {
-    server web:8000;
-}
-
-server {
-    listen 80;
-
-    location / {
-        proxy_pass http://web;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $host;
-        proxy_redirect off;
-    }
-
-    location /images/ {
-        alias /app/images/;
-    }
-
-    location /static/ {
-        alias /app/static/;
-    }
-}