From 2eceee3a4cc2786dae4e9b80a8b5f3bb666d3fc6 Mon Sep 17 00:00:00 2001
From: Subv <subv2112@gmail.com>
Date: Wed, 30 Nov 2016 23:28:31 -0500
Subject: Fixed the rebase mistakes.

---
 src/core/hle/kernel/server_session.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/core/hle/kernel/server_session.h')

diff --git a/src/core/hle/kernel/server_session.h b/src/core/hle/kernel/server_session.h
index 86fe641c0..70661e9af 100644
--- a/src/core/hle/kernel/server_session.h
+++ b/src/core/hle/kernel/server_session.h
@@ -16,7 +16,6 @@
 namespace Kernel {
 
 class ClientSession;
-class ClientPort;
 
 /**
  * Kernel object representing the server endpoint of an IPC session. Sessions are the basic CTR-OS
@@ -44,10 +43,14 @@ public:
      */
     static ResultVal<SharedPtr<ServerSession>> Create(std::string name = "Unknown", std::shared_ptr<Service::SessionRequestHandler> hle_handler = nullptr);
 
-    std::string GetTypeName() const override { return "ServerSession"; }
+    std::string GetTypeName() const override {
+        return "ServerSession";
+    }
 
     static const HandleType HANDLE_TYPE = HandleType::ServerSession;
-    HandleType GetHandleType() const override { return HANDLE_TYPE; }
+    HandleType GetHandleType() const override {
+        return HANDLE_TYPE;
+    }
 
     /**
      * Creates a pair of ServerSession and an associated ClientSession.
-- 
cgit v1.2.3