convert _.extend to PHET_CORE/merge in non-runnable repos, and update…

… doc usages, phetsims/phet-core#71
phetsims · Oct 17, 2019 · d8f45f4 · d8f45f4
1 parent 437c41b
commit d8f45f4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/js/intro/view/beaker/BeakerNode.js b/js/intro/view/beaker/BeakerNode.js
@@ -12,6 +12,7 @@ define( require => {
   const fractionsCommon = require( 'FRACTIONS_COMMON/fractionsCommon' );
   const FractionsCommonColorProfile = require( 'FRACTIONS_COMMON/common/view/FractionsCommonColorProfile' );
   const LinearGradient = require( 'SCENERY/util/LinearGradient' );
+  const merge = require( 'PHET_CORE/merge' );
   const Node = require( 'SCENERY/nodes/Node' );
   const Path = require( 'SCENERY/nodes/Path' );
   const Shape = require( 'KITE/Shape' );
@@ -31,7 +32,7 @@ define( require => {
       assert && assert( typeof numerator === 'number' && numerator >= 0 && numerator % 1 === 0 );
       assert && assert( typeof denominator === 'number' && denominator >= 1 && denominator % 1 === 0 );
 
-      options = _.extend( {
+      options = merge( {
         // {number}
         fullHeight: BeakerNode.DEFAULT_BEAKER_HEIGHT,
         xRadius: 40,