git push cleanup

jdaviz/configs/cubeviz/plugins/sonify_data/sonify_data.py

@@ -93,7 +93,7 @@ def vue_sonify_cube(self, *args):
             display_unit = self.spec_viewer.state.x_display_unit
             min_wavelength = self.spectral_subset.selected_obj.lower.to_value(u.Unit(display_unit))
             max_wavelength = self.spectral_subset.selected_obj.upper.to_value(u.Unit(display_unit))
-            self.flux_viewer.update_listener_wls(min_wavelength, max_wavelength, display_unit)
+            self.flux_viewer.update_listener_wls((min_wavelength, max_wavelength), display_unit)
 
         # Ensure the current spectral region bounds are up-to-date at render time
         self.update_wavelength_range(None)

jdaviz/configs/cubeviz/plugins/sonify_data/sonify_data.vue

@@ -143,33 +143,23 @@
         Stop stream
       </plugin-action-button>
     </v-row>
-<<<<<<< HEAD
-=======
     <j-plugin-section-header>Live Sound Options</j-plugin-section-header>
->>>>>>> 9abf2b3b (sonification plugin options: rearrange, label, defaults.)
     <v-row>
       <v-select
         :menu-props="{ left: true }"
         attach
         :items="sound_devices_items"
         v-model="sound_devices_selected"
         label="Sound device"
-<<<<<<< HEAD
-        hint="Device which sound will be output from. Must be selected BEFORE cube is sonified."
-=======
         hint="Device which sound will be output from."
->>>>>>> 9abf2b3b (sonification plugin options: rearrange, label, defaults.)
         persistent-hint
         ></v-select>
     </v-row>
     <v-row>
         Volume
         <glue-throttled-slider label="Volume" wait="300" max="100" step="1" :value.sync="volume" hide-details class="no-hint" />
-<<<<<<< HEAD
+
     </v-row>
-=======
    </v-row>
-
->>>>>>> 9abf2b3b (sonification plugin options: rearrange, label, defaults.)
  </j-tray-plugin>
 </template>