From a77f7f0be23b333891bba627730d47f5b9e23d25 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 20 Jul 2014 21:28:25 -0700 Subject: [PATCH] Cleanup merge issues --- src/platform/sdl/sdl-events.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/platform/sdl/sdl-events.h b/src/platform/sdl/sdl-events.h index 8c3d73c7b..d8b9c22bb 100644 --- a/src/platform/sdl/sdl-events.h +++ b/src/platform/sdl/sdl-events.h @@ -23,6 +23,4 @@ void GBASDLHandleEvent(struct GBAThread* context, struct GBASDLEvents* sdlContex enum GBAKey GBASDLMapButtonToKey(int button); -enum GBAKey GBASDLMapButtonToKey(int button); - #endif