convert _.extend to PHET_CORE/merge, phetsims/phet-core#71

phetsims · Oct 17, 2019 · 6112ba2 · 6112ba2
1 parent eb1947b
commit 6112ba2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/js/waves/view/SineWaveGenerator.js b/js/waves/view/SineWaveGenerator.js
@@ -10,6 +10,7 @@ define( require => {
 
   // modules
   const LinearFunction = require( 'DOT/LinearFunction' );
+  const merge = require( 'PHET_CORE/merge' );
   const soundConstants = require( 'TAMBO/soundConstants' );
   const SoundGenerator = require( 'TAMBO/sound-generators/SoundGenerator' );
   const waveInterference = require( 'WAVE_INTERFERENCE/waveInterference' );
@@ -35,7 +36,7 @@ define( require => {
      * @param {Object} [options]
      */
     constructor( frequencyProperty, amplitudeProperty, options ) {
-      options = _.extend( {
+      options = merge( {
         initialOutputLevel: 0,
         oscillatorType: 'sine'
       }, options );