Fixed conflicts

plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.cpp

@@ -132,11 +132,7 @@ void ChannelAnalyzerWebAPIAdapter::webapiFormatChannelSettings(
     swgSpectrum->init();
     response.getChannelAnalyzerSettings()->setSpectrumConfig(swgSpectrum);
     swgSpectrum->setAveragingMode((int) spectrumSettings.m_averagingMode);
-<<<<<<< ours
-    swgSpectrum->setAveragingValue(spectrumSettings.m_averagingValue);
-=======
     swgSpectrum->setAveragingValue(GLSpectrumSettings::getAveragingValue(spectrumSettings.m_averagingIndex, spectrumSettings.m_averagingMode));
->>>>>>> theirs
     swgSpectrum->setDecay(spectrumSettings.m_decay);
     swgSpectrum->setDecayDivisor(spectrumSettings.m_decayDivisor);
     swgSpectrum->setDisplayCurrent(spectrumSettings.m_displayCurrent ? 1 : 0);
@@ -383,15 +379,10 @@ void ChannelAnalyzerWebAPIAdapter::webapiUpdateChannelSettings(
         if (channelSettingsKeys.contains("spectrumConfig.averagingMode")) {
             spectrumSettings.m_averagingMode = (GLSpectrumSettings::AveragingMode) response.getChannelAnalyzerSettings()->getSpectrumConfig()->getAveragingMode();
         }
-<<<<<<< ours
-        if (channelSettingsKeys.contains("spectrumConfig.averagingValue")) {
-            spectrumSettings.m_averagingValue = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getAveragingValue();
-=======
         if (channelSettingsKeys.contains("spectrumConfig.averagingValue"))
         {
             spectrumSettings.m_averagingValue = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getAveragingValue();
             spectrumSettings.m_averagingIndex = GLSpectrumSettings::getAveragingIndex(spectrumSettings.m_averagingValue, spectrumSettings.m_averagingMode);
->>>>>>> theirs
         }
         if (channelSettingsKeys.contains("spectrumConfig.decay")) {
             spectrumSettings.m_decay = response.getChannelAnalyzerSettings()->getSpectrumConfig()->getDecay();

sdrbase/dsp/glspectrumsettings.cpp

@@ -48,11 +48,7 @@ void GLSpectrumSettings::resetToDefaults()
 	m_displayGrid = false;
 	m_averagingMode = AvgModeNone;
 	m_averagingIndex = 0;
-<<<<<<< ours
-	m_averagingValue = 1;
-=======
     m_averagingValue = 1;
->>>>>>> theirs
 	m_linear = false;
     m_ssb = false;
     m_usb = true;