From 828737d9e26716e6ba9b0db8481479e1d4b93f86 Mon Sep 17 00:00:00 2001
From: MaZderMind <git@mazdermind.de>
Date: Wed, 28 Sep 2016 08:50:26 +0200
Subject: fix merge issues

---
 voctogui/lib/videodisplay.py | 1 -
 1 file changed, 1 deletion(-)

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,
         )
 
-- 
cgit v1.2.3