Fix merge conflict

2017-12-07 16:28:30 -08:00 · 2017-12-07 16:28:30 -08:00 · 2d7a108e79
commit 2d7a108e79
parent 193f66fd2d
1 changed files with 0 additions and 4 deletions
--- a/libs/music/sounds.ts
+++ b/libs/music/sounds.ts
@ -257,11 +257,7 @@ namespace sounds {

 namespace music {
    let numSoundsPlaying = 0;
-<<<<<<< Updated upstream
-    let soundsLimit = 3;
-=======
    const soundsLimit = 1;
->>>>>>> Stashed changes

    /**
     * Plays a sound