Cleanup merge issues

This commit is contained in:
Jeffrey Pfau 2014-07-20 21:28:25 -07:00
parent 489b932c52
commit a77f7f0be2
1 changed files with 0 additions and 2 deletions

View File

@ -23,6 +23,4 @@ void GBASDLHandleEvent(struct GBAThread* context, struct GBASDLEvents* sdlContex
enum GBAKey GBASDLMapButtonToKey(int button);
enum GBAKey GBASDLMapButtonToKey(int button);
#endif