now you know an evil plan of mine :}

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@875 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-15 06:13:23 +00:00 · 2008-10-15 06:13:23 +00:00 · 2abedd28fe
parent a6365c758e
commit 2abedd28fe
1 changed files with 0 additions and 3 deletions
--- 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