Skip to content

Commit

Permalink
convert _.extend to PHET_CORE/merge, phetsims/phet-core#71
Browse files Browse the repository at this point in the history
  • Loading branch information
zepumph authored and marlitas committed Jun 22, 2022
1 parent 4ffd946 commit df72a99
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion js/common/view/TriangleNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ define( require => {
// modules
const inherit = require( 'PHET_CORE/inherit' );
const Matrix3 = require( 'DOT/Matrix3' );
const merge = require( 'PHET_CORE/merge' );
const Path = require( 'SCENERY/nodes/Path' );
const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
const Shape = require( 'KITE/Shape' );
Expand All @@ -36,7 +37,7 @@ define( require => {
assert && assert( Side.isSide( side ), 'Side should be Side.LEFT or Side.RIGHT' );

// defaults
options = _.extend( {
options = merge( {
stroke: 'black',
lineWidth: 1
}, options );
Expand Down

0 comments on commit df72a99

Please sign in to comment.