rm residual merge conflict

WasatchPhotonics · Jun 27, 2023 · 724a513 · 724a513
1 parent 9eb539b
commit 724a513
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/enlighten/scope/GainDBFeature.py b/enlighten/scope/GainDBFeature.py
@@ -88,12 +88,9 @@ def init_hotplug(self):
         spec = self.ctl.multispec.current_spectrometer()
         spec.settings.state.gain_db = spec.settings.eeprom.detector_gain
 
-<<<<<<< HEAD
-=======
         self.ctl.form.ui.doubleSpinBox_gain.setValue(spec.settings.state.gain_db)
         log.debug("GainDBFeature.init_hotplug: initialized to %.2f", spec.settings.state.gain_db)
 
->>>>>>> sbee-refactor-gaindb
     # called by initialize_new_device a little after the other function
     def reset(self, hotplug=False):
         if not self.update_visibility():