Fix merge conflict

This commit is contained in:
System Administrator committed 2017-12-07 16:28:30 -08:00
1 parent 193f66fd2d
commit 2d7a108e79
1 file changed
-4
-4
View File
@@ -257,11 +257,7 @@ namespace sounds {
namespace music {
let numSoundsPlaying = 0;
<<<<<<< Updated upstream
let soundsLimit = 3;
=======
const soundsLimit = 1;
>>>>>>> Stashed changes
/**
* Plays a sound