[revert] Resolving conflicting changes

This commit is contained in:
CamilleLaVey
2025-11-26 10:48:01 -04:00
committed by Caio Oliveira
parent e6ec42ee9d
commit fec98b8913
2 changed files with 6 additions and 12 deletions
@@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later