From 6a289b6559e0add6ad6e8848d5ca7bec3f86ff0a Mon Sep 17 00:00:00 2001 From: vibhatsu Date: Sun, 1 Sep 2024 17:09:52 +0530 Subject: [PATCH] Early return --- src/audio.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/audio.cpp b/src/audio.cpp index 4b19ec7..5438263 100644 --- a/src/audio.cpp +++ b/src/audio.cpp @@ -69,10 +69,15 @@ 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() {