diff options
author | 2014-12-29 19:47:41 -0800 | |
---|---|---|
committer | 2014-12-29 19:47:41 -0800 | |
commit | 8ba9ac0f74abb0408a26207a76a0c1808bad8de0 (patch) | |
tree | f1c7c3393fa726435b5b90bf335567c93e528ef1 /src/core/hle/service/apt_u.h | |
parent | a19354acedbfeafd28219c48a1ec32f76dd17a54 (diff) | |
parent | 3d14eb285382740b144e5b047cb2ad072f6129ea (diff) |
Fix merge conflicts
Diffstat (limited to 'src/core/hle/service/apt_u.h')
-rw-r--r-- | src/core/hle/service/apt_u.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/core/hle/service/apt_u.h b/src/core/hle/service/apt_u.h index 30673040..aad918cf 100644 --- a/src/core/hle/service/apt_u.h +++ b/src/core/hle/service/apt_u.h @@ -1,5 +1,5 @@ // Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 +// Licensed under GPLv2 or any later version // Refer to the license.txt file included. #pragma once @@ -20,15 +20,8 @@ namespace APT_U { /// Interface to "APT:U" service class Interface : public Service::Interface { public: - Interface(); - ~Interface(); - - /** - * Gets the string port name used by CTROS for the service - * @return Port name of service - */ std::string GetPortName() const override { return "APT:U"; } |