From 2279521482689b79d3baa5be7560431b11825ca1 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Wed, 17 Jun 2020 22:15:36 -0700
Subject: [PATCH] Minor cleanup

---
 include/mgba/internal/ds/memory.h | 2 +-
 src/gb/input.c                    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/mgba/internal/ds/memory.h b/include/mgba/internal/ds/memory.h
index 8f5eb4314..bb365971e 100644
--- a/include/mgba/internal/ds/memory.h
+++ b/include/mgba/internal/ds/memory.h
@@ -18,7 +18,7 @@ CXX_GUARD_START
 #include <mgba/internal/ds/slot1.h>
 #include <mgba/internal/ds/spi.h>
 
-const uint32_t redzoneInstruction;
+extern const uint32_t redzoneInstruction;
 
 enum DSMemoryRegion {
 	DS7_REGION_BIOS = 0x0,
diff --git a/src/gb/input.c b/src/gb/input.c
index 572d4513f..e1f975c6b 100644
--- a/src/gb/input.c
+++ b/src/gb/input.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2013-2019 Jeffrey Pfau
->>>>>>> master
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this