From 811af1bf9d811649f4dda6655e608cb9db28faf2 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Tue, 26 Feb 2019 23:55:00 +0100 Subject: [PATCH] Removed conflict leftovers --- platypush/backend/http/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/platypush/backend/http/__init__.py b/platypush/backend/http/__init__.py index cd1faa1b7..b7796ffd8 100644 --- a/platypush/backend/http/__init__.py +++ b/platypush/backend/http/__init__.py @@ -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):