Get rid of header to fix build error

2024-03-07 19:02:58 +00:00 · 2024-03-07 19:02:58 +00:00 · 2a5fe1719d
parent d07e6bb681
commit 2a5fe1719d
1 changed files with 0 additions and 4 deletions
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@ -1,11 +1,7 @@
 // SPDX-FileCopyrightText: 2014 Citra Emulator Project  & 2024 suyu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-<<<<<<< HEAD
 // Modified by KawaiiBunga on <2024/03/07>
-=======
-// Modified by palfaiate on <2024/03/07>
->>>>>>> ba5b604f9a095524e7ae479b6c10d4e35f80e98f

 #include <cinttypes>
 #include <clocale>