mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-08-24 16:30:44 +00:00
cd8540c4b4
# Conflicts: # src/core/hle/service/caps/caps_manager.cpp # src/core/hle/service/pctl/parental_control_service.h # src/yuzu_cmd/yuzu.cpp