From af5bd951aeb43c341d5126bc4141992169e46d57 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Wed, 31 Jul 2019 17:54:18 +0200
Subject: More audio ped

---
 src/vehicles/Plane.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/vehicles/Plane.cpp')

diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp
index 775cf572..771f36e1 100644
--- a/src/vehicles/Plane.cpp
+++ b/src/vehicles/Plane.cpp
@@ -968,8 +968,16 @@ bool CPlane::HasDropOffCesnaBeenShotDown(void) { return DropOffCesnaMissionStatu
 class CPlane_ : public CPlane
 {
 public:
+<<<<<<< HEAD
+<<<<<<< HEAD
 	void ctor(int32 id, uint8 CreatedBy) { ::new (this) CPlane(id, CreatedBy); }
 	void dtor(void) { CPlane::~CPlane(); }
+=======
+	void dtor(void) { this->~CPlane(); }
+>>>>>>> More audio ped
+=======
+	void dtor(void) { CPlane::~CPlane(); }
+>>>>>>> fix
 };
 
 STARTPATCHES
-- 
cgit v1.2.3