From 210ae716d5f75c1310e8d442f503977bc94e362b Mon Sep 17 00:00:00 2001 From: PTRCoder Date: Sat, 24 Aug 2024 20:25:26 +0200 Subject: [PATCH] Fixed merge issues --- src/core/hle/service/ac/ac.cpp | 2 -- src/core/hle/service/nwm/nwm_uds.cpp | 1 - 2 files changed, 3 deletions(-) diff --git a/src/core/hle/service/ac/ac.cpp b/src/core/hle/service/ac/ac.cpp index b9e8ebc89..77923c5c6 100644 --- a/src/core/hle/service/ac/ac.cpp +++ b/src/core/hle/service/ac/ac.cpp @@ -21,8 +21,6 @@ #include "core/hle/service/ac/ac_u.h" #include "core/hle/service/nwm/nwm_inf.h" #include "core/hle/service/soc/soc_u.h" -#include "network/network.h" -#include "network/room.h" #include "core/memory.h" #include "network/network.h" #include "network/room.h" diff --git a/src/core/hle/service/nwm/nwm_uds.cpp b/src/core/hle/service/nwm/nwm_uds.cpp index bd2c038f1..58b2f4e35 100644 --- a/src/core/hle/service/nwm/nwm_uds.cpp +++ b/src/core/hle/service/nwm/nwm_uds.cpp @@ -14,7 +14,6 @@ #include "core/core_timing.h" #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/event.h" -#include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/shared_memory.h" #include "core/hle/kernel/shared_page.h" #include "core/hle/result.h"