better web than nano on termux

3 weeks ago · 8770fce104
1 changed files with 0 additions and 4 deletions
--- 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")