c_meyer/pxt-ev3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
System Administrator 2017-12-07 16:28:30 -08:00
parent 193f66fd2d
commit 2d7a108e79
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/music/sounds.ts
View File

@ -257,11 +257,7 @@ namespace sounds {
namespace music { namespace music {
let numSoundsPlaying = 0; let numSoundsPlaying = 0;
<<<<<<< Updated upstream
let soundsLimit = 3;
=======
const soundsLimit = 1; const soundsLimit = 1;
>>>>>>> Stashed changes
/** /**
* Plays a sound * Plays a sound