From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Tue, 20 Jul 2010 08:11:35 +0000 (+0200)
Subject: merge fix
X-Git-Tag: 3.0.0~28^2~37
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/c133a7b7ee3642dac16867449fc94b86b5d8fed5?hp=675f9d0eeb82577252a68ee263049acc1ff80bcc

merge fix
---

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index b50b52d0..dec87a9a 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -290,10 +290,8 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 	if ( m_sourceinfo.is_streaming )
 	{
 		uri = g_strdup_printf ("%s", filename);
-<<<<<<< HEAD
 		m_streamingsrc_timeout = eTimer::create(eApp);;
 		CONNECT(m_streamingsrc_timeout->timeout, eServiceMP3::sourceTimeout);
-=======
 
 		std::string config_str;
 		if( ePythonConfigQuery::getConfigValue("config.mediaplayer.useAlternateUserAgent", config_str) == 0 )
@@ -303,7 +301,6 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 		}
 		if ( m_useragent.length() == 0 )
 			m_useragent = "Dream Multimedia Dreambox Enigma2 Mediaplayer";
->>>>>>> b08c138... implement configurable http user-agent (fixes #224)
 	}
 	else if ( m_sourceinfo.containertype == ctCDA )
 	{