diff options
| author | omegadox <omegadox@gmail.com> | 2008-10-15 06:13:23 +0000 |
|---|---|---|
| committer | omegadox <omegadox@gmail.com> | 2008-10-15 06:13:23 +0000 |
| commit | 2abedd28fe4058e8d83993740e09cc800e3ba059 (patch) | |
| tree | 54ecafa43bb595f522882cccfa32e1679ade91a6 /Source | |
| parent | a6365c758e910f43a6ad14e51c2724c7045bd111 (diff) | |
now you know an evil plan of mine :}
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@875 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/Src/PatchEngine.cpp | 3 |
1 files changed, 0 insertions, 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
|