Fix rebase issues

2016-12-24 17:48:00 -06:00
parent 06ef32f450
commit c761825753
4 changed files with 4 additions and 4 deletions
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -14,7 +14,6 @@
 #include "common/string_util.h"
 #include "core/core.h"
 #include "core/settings.h"
-#include "core/system.h"

 #include "input_core/devices/keyboard.h"
 #include "input_core/input_core.h"