resolve merge conflict in .forgejo/workflows/verify.yml

i hope to fucking god this works
This commit is contained in:
RadsammyT
2024-03-24 00:23:29 -04:00
414 changed files with 432 additions and 378 deletions

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2014 Citra Emulator Project & 2024 suyu Emulator Project
// SPDX-FileCopyrightText: 2014 Citra Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <chrono>