X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/544e1af49c6c1c25a3ef97b27ac3e6764a008824..979cdde152f5998de6593f1d3b6998bb224d5c97:/lib/dvb/decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index f73dbdd9..6f0ead65 100644
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -295,7 +295,6 @@ eDVBAudio::~eDVBAudio()
 DEFINE_REF(eDVBVideo);
 
 eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev)
-<<<<<<< HEAD:lib/dvb/decoder.cpp
 	: m_demux(demux), m_dev(dev),
 	m_width(-1), m_height(-1), m_framerate(-1), m_aspect(-1), m_progressive(-1)
 {