From 2abedd28fe4058e8d83993740e09cc800e3ba059 Mon Sep 17 00:00:00 2001
From: omegadox <omegadox@gmail.com>
Date: Wed, 15 Oct 2008 06:13:23 +0000
Subject: [PATCH] now you know an evil plan of mine :}

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@875 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/PatchEngine.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Source/Core/Core/Src/PatchEngine.cpp b/Source/Core/Core/Src/PatchEngine.cpp
index 20d4f9d0e3..c8ef0a24c4 100644
--- a/Source/Core/Core/Src/PatchEngine.cpp
+++ b/Source/Core/Core/Src/PatchEngine.cpp
@@ -146,8 +146,6 @@ void PatchEngine_ApplyARPatches()
 		if (iter->active)
 			RunActionReplayCode(*iter, false);
 	}
-<<<<<<< .mine
-}=======
 }
 
 void LoadActionReplayCodes(IniFile &ini) 
@@ -430,4 +428,3 @@ void RunActionReplayCode(const ARCode &code, bool nowIsBootup) {
 		}
 	}
 }
->>>>>>> .r873