From f8cc86c227b63f0bf45a9a152935b765a3b4a953 Mon Sep 17 00:00:00 2001
From: Roman Masanin <36927roma@gmail.com>
Date: Sun, 8 Nov 2020 16:23:20 +0300
Subject: fix merge

---
 src/audio/AudioManager.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 9f833a6c..992b21a0 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -374,8 +374,8 @@ public:
 	uint8 GetNum3DProvidersAvailable() const; // done
 	uint32 GetPedCommentSfx(CPed *ped, int32 sound);
 	void GetPhrase(uint32 &phrase, uint32 &prevPhrase, uint32 sample, uint32 maxOffset) const;
-	float GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange);
-	float GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange);
+	float GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange);   //done
+	float GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange);//done
 
 	bool HasAirBrakes(int32 model) const; // done
 
-- 
cgit v1.2.3