From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 29 Jun 2021 00:28:05 +0000 (+0200)
Subject: fix merge
X-Git-Tag: 2.1~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ea5c910e1c19036f81e6070630fd926e8079017d;p=teleforma.git

fix merge
---

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