Merge remote-tracking branch 'origin/master'

# Conflicts: # js/soundManager.js
phetsims · Sep 10, 2019 · bc061db · bc061db
2 parents 79ba0fa + b121704
commit bc061db
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/js/soundManager.js b/js/soundManager.js
@@ -198,7 +198,7 @@ define( require => {
               } )
               .catch( err => {
                 const errorMessage = 'error when trying to resume audio context, err = ' + err;
-                console.err( errorMessage );
+                console.error( errorMessage );
                 assert && alert( errorMessage );
               } );
           }