From 95e218891431eb195587cf48f2095ce16bad36cc Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Wed, 8 Feb 2017 20:14:37 -0500
Subject: [PATCH] revert this too

---
 src/NDS.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/NDS.cpp b/src/NDS.cpp
index dbe04cdb..f415819f 100644
--- 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)
 {