Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
twant committed Oct 9, 2019
2 parents e40387d + 0d2a959 commit 1851733
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions js/ohms-law-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ require.config( {
SCENERY_PHET: '../../scenery-phet/js',
SUN: '../../sun/js',
TAMBO: '../../tambo/js',
TANDEM: '../../tandem/js',
VIBE: '../../vibe/js'
TANDEM: '../../tandem/js'
},

// Cache busting is applied by default, but can be disabled via ?cacheBust=false, see initialize-globals.js
Expand Down
2 changes: 1 addition & 1 deletion js/ohms-law/OhmsLawA11yStrings.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ define( require => {
value: 'The Circuit'
},
circuitDescription: {
value: 'A pair of wires connect a resistor to a series of batteries. In circuit, '
value: 'A pair of wires connect a resistor to a series of batteries. In circuit,'
},

//--------------------------------------------------------------------------
Expand Down

0 comments on commit 1851733

Please sign in to comment.