start rebasing

2017-03-19 15:10:08 -05:00 · 2017-03-19 15:10:08 -05:00 · 4c0ef6782f
parent 95e2188914
commit 4c0ef6782f
1 changed files with 0 additions and 2 deletions
--- a/src/NDS.cpp
+++ b/src/NDS.cpp
@ -323,8 +323,6 @@ void Reset()
    _soundbias = 0;
 }

-<<<<<<< HEAD:src/NDS.cpp
-
 void LoadROM(const char* path, bool direct)
 {
    Reset();