From 33be5ddfb782a7999f7d6061c90f7a84c8d5d742 Mon Sep 17 00:00:00 2001
From: vibhatsu <maulikbarot2915@gmail.com>
Date: Sun, 1 Sep 2024 17:16:47 +0530
Subject: [PATCH] Early return

---
 src/audio.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/audio.cpp b/src/audio.cpp
index 5438263..f19e4e9 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -69,15 +69,8 @@ void APU::initializeReadWriteHandlers()
 		return;
 	}
 
-<<<<<<< HEAD
-	mMap->setAudioReadHandler([this](Word address)
-	    { return this->readByte(address); });
-	mMap->setAudioWriteHandler([this](Word address, Byte value)
-	    { this->writeByte(address, value); });
-=======
 	mMap->setAudioReadHandler([this](Word address) { return this->readByte(address); });
 	mMap->setAudioWriteHandler([this](Word address, Byte value) { this->writeByte(address, value); });
->>>>>>> bab3ce9 (Early return)
 }
 void APU::test()
 {