Fixed the rebase mistakes.

This commit is contained in:
Subv 2016-11-30 23:28:31 -05:00
parent 4f2326c8a9
commit 4c4f50dfaf
11 changed files with 76 additions and 83 deletions

View file

@ -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 {