merge conflict cleanup

2013-01-18 17:48:13 -05:00 · 2013-01-18 17:48:13 -05:00 · c0ca6b381f
parent 909e290bd3
commit c0ca6b381f
1 changed files with 0 additions and 3 deletions
--- 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']);