Fixed the rebase mistakes.

2016-11-30 23:28:31 -05:00
parent 20f90896af
commit 694df935a6
11 changed files with 76 additions and 83 deletions
--- a/src/core/hle/kernel/client_session.cpp
+++ b/src/core/hle/kernel/client_session.cpp
@@ -4,11 +4,8 @@

 #include "common/assert.h"

-#include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/client_session.h"
 #include "core/hle/kernel/server_session.h"
-#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/service.h"

 namespace Kernel {