diff options
| author | Subv <subv2112@gmail.com> | 2016-11-30 23:28:31 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2016-11-30 23:28:31 -0500 |
| commit | 2eceee3a4cc2786dae4e9b80a8b5f3bb666d3fc6 (patch) | |
| tree | 4a7069d46afb5655af9f091c09041211653fb75f /src/core/hle/service/srv.cpp | |
| parent | 009b15b3aa9858930f461d825f7dd030fc963801 (diff) | |
Fixed the rebase mistakes.
Diffstat (limited to 'src/core/hle/service/srv.cpp')
| -rw-r--r-- | src/core/hle/service/srv.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp index 6731afc22..d228e3523 100644 --- a/src/core/hle/service/srv.cpp +++ b/src/core/hle/service/srv.cpp @@ -6,11 +6,10 @@ #include "common/common_types.h" #include "common/logging/log.h" -#include "core/hle/service/srv.h" #include "core/hle/kernel/client_session.h" +#include "core/hle/kernel/server_session.h" #include "core/hle/kernel/event.h" #include "core/hle/service/srv.h" -#include "core/hle/kernel/server_session.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Namespace SRV |