lukmangrd/platypush
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed conflict leftovers

Browse source
This commit is contained in:
Fabio Manganiello 2019-02-26 23:55:00 +01:00
parent 17367f5b3e
commit 811af1bf9d
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
platypush/backend/http/__init__.py
View file

@ -172,13 +172,8 @@ class HttpBackend(Backend):
if ssl_cert else None if ssl_cert else None
if self.uwsgi_args: if self.uwsgi_args:
<<<<<<< HEAD
self.uwsgi_args = [str(_) for _ in self.uwsgi_args] + \ self.uwsgi_args = [str(_) for _ in self.uwsgi_args] + \
['--module', 'platypush.backend.http.uwsgi', '--enable-threads'] ['--module', 'platypush.backend.http.uwsgi', '--enable-threads']
=======
self.uwsgi_args = ['--plugins', 'python3', '--enable-threads'] + \
self.uwsgi_args + ['--module', 'platypush.backend.http.uwsgi']
>>>>>>> Added camera plugin over cv2
def send_message(self, msg): def send_message(self, msg):