From 4bcd1769442b0b410bc3b14867ee23a2f18b78bf Mon Sep 17 00:00:00 2001
From: Roman Masanin <36927roma@gmail.com>
Date: Mon, 26 Oct 2020 00:17:21 +0300
Subject: fix merge

---
 src/audio/AudioManager.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index eb8c0bf2..9a7c754d 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -321,7 +321,7 @@ public:
 	void ProcessEntity(int32 sound);                                         // done
 	void ProcessExplosions(int32 explosion);                                 // done
 	void ProcessFireHydrant();                                               // done
-	void ProcessFires(int32 entity);                                         // 
+	void ProcessFires(int32 entity);                                         // done
 	void ProcessFrontEnd();                                                  // done
 	void ProcessGarages();                                                   // 
 	void ProcessCarHeli(cVehicleParams* params);                             // done
-- 
cgit v1.2.3