From 28cb9e24e53e5dbc1f3ff8c06307b5e67cc6494c Mon Sep 17 00:00:00 2001 From: DraVee Date: Wed, 14 Jan 2026 01:09:54 +0100 Subject: [PATCH] Atualizar src/yuzu/migration_worker.h --- src/yuzu/migration_worker.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/yuzu/migration_worker.h b/src/yuzu/migration_worker.h index 858e834199..9738e69018 100644 --- a/src/yuzu/migration_worker.h +++ b/src/yuzu/migration_worker.h @@ -10,15 +10,9 @@ typedef struct Emulator { const char *m_name; -<<<<<<< HEAD - Common::FS::EmuPath e_user_dir; - Common::FS::EmuPath e_config_dir; - Common::FS::EmuPath e_cache_dir; -======= LegacyPath e_user_dir; LegacyPath e_config_dir; LegacyPath e_cache_dir; ->>>>>>> parent of 39f226a853 ([qt] Ryujinx save data link (#2815)) const std::string get_user_dir() const { return Common::FS::GetLegacyPath(e_user_dir).string();