1 files changed, 8 insertions, 0 deletions

diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp
index 9b1a651d..1c242f0e 100644
--- a/src/vehicles/Heli.cpp
+++ b/src/vehicles/Heli.cpp
@@ -1038,8 +1038,16 @@ void CHeli::ActivateHeli(bool activate) { ScriptHeliOn = activate; }
 class CHeli_ : public CHeli
 {
 public:
+<<<<<<< HEAD
+<<<<<<< HEAD
 	void ctor(int32 id, uint8 CreatedBy) { ::new (this) CHeli(id, CreatedBy); }
 	void dtor(void) { CHeli::~CHeli(); }
+=======
+	void dtor(void) { this->~CHeli(); }
+>>>>>>> More audio ped
+=======
+	void dtor(void) { CHeli::~CHeli(); }
+>>>>>>> fix
 };
 
 STARTPATCHES