From 6c46ea34c99ec2c633926dfd56a2583511fc4e87 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sat, 25 May 2013 22:52:14 +0200
Subject: [PATCH] femanager: remove dead code (merge error)

---
 src/zapit/src/femanager.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp
index 4979d932f..7cf4fa47a 100644
--- a/src/zapit/src/femanager.cpp
+++ b/src/zapit/src/femanager.cpp
@@ -323,11 +323,6 @@ void CFEManager::saveSettings(bool write)
 		frontend_config_t & fe_config = fe->getConfig();
 
 		INFO("fe%d", fe->fenumber);
-		if(fe->fenumber && mode != FE_MODE_ALONE) {
-			CFrontend * fe0 = getFE(0);
-			fe->setConfig(fe0->getConfig());
-			fe->setSatellites(fe0->getSatellites());
-		}
 
 		setConfigValue(fe, "diseqcType", fe_config.diseqcType);
 		setConfigValue(fe, "diseqcRepeats", fe_config.diseqcRepeats);