From ea5c910e1c19036f81e6070630fd926e8079017d Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 29 Jun 2021 02:28:05 +0200 Subject: [PATCH] fix merge --- app/wsgi.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/wsgi.sh b/app/wsgi.sh index 90c7eb97..ca4238f8 100755 --- a/app/wsgi.sh +++ b/app/wsgi.sh @@ -9,17 +9,6 @@ src='/srv/src/' uwsgi_log='/var/log/uwsgi/app.log' debug_log='/var/log/app/debug.log' -<<<<<<< HEAD -# uwsgi params -port=8000 -processes=32 -http_timeout=120 -#threads=2 -autoreload=3 -uid='www-data' -gid='www-data' -======= ->>>>>>> dev # patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2' # Install a package in development mode -- 2.39.5