From 458fc63f0196dc92362b44d5cf7ebf67bbc903e1 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Fri, 2 Aug 2019 17:43:40 +0200
Subject: Cleanup

---
 src/peds/PlayerPed.cpp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'src/peds/PlayerPed.cpp')

diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index 1dcbdf46..5ae8c4be 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -97,16 +97,8 @@ CPlayerPed::AnnoyPlayerPed(bool annoyedByPassingEntity)
 class CPlayerPed_ : public CPlayerPed
 {
 public:
-<<<<<<< HEAD
-<<<<<<< HEAD
 	CPlayerPed* ctor(void) { return ::new (this) CPlayerPed(); }
 	void dtor(void) { CPlayerPed::~CPlayerPed(); }
-=======
-	void dtor(void) { this->~CPlayerPed(); }
->>>>>>> More audio ped
-=======
-	void dtor(void) { CPlayerPed::~CPlayerPed(); }
->>>>>>> fix
 };
 
 STARTPATCHES
-- 
cgit v1.2.3