forked from platypush/platypush
Removed conflict leftovers
This commit is contained in:
parent
17367f5b3e
commit
811af1bf9d
1 changed files with 0 additions and 5 deletions
|
@ -172,13 +172,8 @@ class HttpBackend(Backend):
|
|||
if ssl_cert else None
|
||||
|
||||
if self.uwsgi_args:
|
||||
<<<<<<< HEAD
|
||||
self.uwsgi_args = [str(_) for _ in self.uwsgi_args] + \
|
||||
['--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):
|
||||
|
|
Loading…
Reference in a new issue