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 jbphet committed Apr 1, 2020
1 parent f09ed79 commit 1bb172a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion js/common/model/NumberLine.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ define( require => {
// modules
const BooleanProperty = require( 'AXON/BooleanProperty' );
const Bounds2 = require( 'DOT/Bounds2' );
const merge = require( 'PHET_CORE/merge' );
const numberLineIntegers = require( 'NUMBER_LINE_INTEGERS/numberLineIntegers' );
const NumberLineOrientation = require( 'NUMBER_LINE_INTEGERS/common/model/NumberLineOrientation' );
const NumberLinePoint = require( 'NUMBER_LINE_INTEGERS/common/model/NumberLinePoint' );
Expand Down Expand Up @@ -43,7 +44,7 @@ define( require => {
*/
constructor( zeroPosition, options ) {

options = _.extend( {
options = merge( {

// {string} - whether the number line is initially oriented in the horizontal or vertical direction
initialOrientation: NumberLineOrientation.HORIZONTAL,
Expand Down

0 comments on commit 1bb172a

Please sign in to comment.