From c0ca6b381fb3c1b757a3db2d2f48cced832758da Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 18 Jan 2013 17:48:13 -0500 Subject: [PATCH] merge conflict cleanup --- airtime_mvc/application/controllers/PreferenceController.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 4fe1e79f7..9e494c90c 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -240,9 +240,6 @@ class PreferenceController extends Zend_Controller_Action $md = array('schedule' => Application_Model_Schedule::getSchedule()); Application_Model_RabbitMq::SendMessageToPypo("update_schedule", $md); } - - Application_Model_Preference::SetEnableReplayGain($values["enableReplayGain"]); - Application_Model_Preference::setReplayGainModifier($values["replayGainModifier"]); Application_Model_StreamSetting::setOffAirMeta($values['offAirMeta']);