diff options
| author | MaZderMind <git@mazdermind.de> | 2016-09-28 08:50:26 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2016-09-28 08:50:26 +0200 |
| commit | 828737d9e26716e6ba9b0db8481479e1d4b93f86 (patch) | |
| tree | dd633bd88f60760630e85550a95526725bc31bc3 | |
| parent | ad1cc10ba6e7cb813b67ddeb07d28cbbc5c8b48a (diff) | |
fix merge issues
| -rw-r--r-- | voctogui/lib/videodisplay.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/voctogui/lib/videodisplay.py b/voctogui/lib/videodisplay.py index 9d531d5..fa558dc 100644 --- a/voctogui/lib/videodisplay.py +++ b/voctogui/lib/videodisplay.py @@ -127,7 +127,6 @@ class VideoDisplay(object): previewcaps=Config.get('previews', 'videocaps'), host=Args.host if Args.host else Config.get('server', 'host'), vdec=vdec, - host=Config.get('server', 'host'), port=port, ) |