From bda26cba1f015ef191cafdb743854185c2ac0c96 Mon Sep 17 00:00:00 2001
From: Anon <makotech222@gmail.com>
Date: Sat, 10 Sep 2016 15:23:27 -0500
Subject: [PATCH] fix bad rebase

---
 src/core/system.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/core/system.cpp b/src/core/system.cpp
index 5551789b6..59051faa5 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -30,7 +30,6 @@ Result Init(EmuWindow* emu_window) {
         return Result::ErrorInitVideoCore;
     }
     AudioCore::Init();
-    InputCore::Init();
     CheatCore::Init();
     GDBStub::Init();
 
@@ -46,7 +45,6 @@ bool IsPoweredOn() {
 void Shutdown() {
     GDBStub::Shutdown();
     CheatCore::Shutdown();
-    InputCore::Shutdown();
     AudioCore::Shutdown();
     VideoCore::Shutdown();
     HLE::Shutdown();