From 4c0ef6782f0e2392eadfc1d7eab3161f2755c10f Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Sun, 19 Mar 2017 15:10:08 -0500
Subject: [PATCH] start rebasing

---
 src/NDS.cpp | 2 --
 1 file changed, 2 deletions(-)

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