From 8770fce1048cd3cf1611bc5bf5c480c265bdfe8e Mon Sep 17 00:00:00 2001
From: DraVee <dravee@eden-emu.dev>
Date: Wed, 14 Jan 2026 01:03:40 +0100
Subject: [PATCH] better web than nano on termux

---
 src/yuzu/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 43658ce63c..8c6d0a2351 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -233,11 +233,7 @@ add_executable(yuzu
 
     data_dialog.h data_dialog.cpp data_dialog.ui
     data_widget.ui
-<<<<<<< HEAD
-    ryujinx_dialog.h ryujinx_dialog.cpp ryujinx_dialog.ui
     main_window.h main_window.cpp
-=======
->>>>>>> parent of 39f226a853 ([qt] Ryujinx save data link (#2815))
 )
 
 set_target_properties(yuzu PROPERTIES OUTPUT_NAME "eden")