revert this too

2017-02-08 20:14:37 -05:00 · 2017-02-08 20:14:37 -05:00 · 95e2188914
parent 6576b3c499
commit 95e2188914
1 changed files with 1 additions and 0 deletions
--- a/src/NDS.cpp
+++ b/src/NDS.cpp
@ -323,6 +323,7 @@ void Reset()
    _soundbias = 0;
 }

+<<<<<<< HEAD:src/NDS.cpp

 void LoadROM(const char* path, bool direct)
 {