From 2d7a108e793cdbda23542549727e52597174800f Mon Sep 17 00:00:00 2001
From: System Administrator <root@Caitlins-MacBook-Air-2.local>
Date: Thu, 7 Dec 2017 16:28:30 -0800
Subject: [PATCH] Fix merge conflict

---
 libs/music/sounds.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libs/music/sounds.ts b/libs/music/sounds.ts
index dd8a1344..8fe1a906 100644
--- 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