Fixed merge issues

This commit is contained in:
PTRCoder 2024-08-24 20:25:26 +02:00
parent f182ea3f2c
commit 210ae716d5
2 changed files with 0 additions and 3 deletions

View File

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

View File

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