From 5bab8f06066f90baa8692095f9889ac650b492d1 Mon Sep 17 00:00:00 2001
From: capitalistspz <keipitalists@proton.me>
Date: Thu, 26 Jun 2025 16:08:18 +0100
Subject: [PATCH] Remove the merge conflict markers

---
 CMakeLists.txt         | 5 +----
 src/gui/MainWindow.cpp | 6 ------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0a6af56..fb22c0bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,20 +222,17 @@ endif()
 
 add_subdirectory("dependencies/ih264d" EXCLUDE_FROM_ALL)
 
-<<<<<<< camera
 set(BUILD_SHARED_LIBS OFF)
 add_subdirectory("dependencies/openpnp-capture" EXCLUDE_FROM_ALL SYSTEM)
 set(BUILD_SHARED_LIBS "")
 
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch64)|(AARCH64)")
-=======
 if (CMAKE_OSX_ARCHITECTURES)
 	set(CEMU_ARCHITECTURE ${CMAKE_OSX_ARCHITECTURES})
 else()
 	set(CEMU_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
 endif()
+
 if(CEMU_ARCHITECTURE MATCHES "(aarch64)|(AARCH64)|(arm64)|(ARM64)")
->>>>>>> main
 	add_subdirectory("dependencies/xbyak_aarch64" EXCLUDE_FROM_ALL)
 endif()
 
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index de5104f4..be6fbbe1 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -92,11 +92,8 @@ enum
 	MAINFRAME_MENU_ID_OPTIONS_GENERAL2,
 	MAINFRAME_MENU_ID_OPTIONS_AUDIO,
 	MAINFRAME_MENU_ID_OPTIONS_INPUT,
-<<<<<<< camera
 	MAINFRAME_MENU_ID_OPTIONS_CAMERA,
-=======
 	MAINFRAME_MENU_ID_OPTIONS_MAC_SETTINGS,
->>>>>>> main
 	// options -> account
 	MAINFRAME_MENU_ID_OPTIONS_ACCOUNT_1 = 20350,
 	MAINFRAME_MENU_ID_OPTIONS_ACCOUNT_12 = 20350 + 11,
@@ -194,11 +191,8 @@ EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_GENERAL, MainWindow::OnOptionsInput)
 EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_GENERAL2, MainWindow::OnOptionsInput)
 EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_AUDIO, MainWindow::OnOptionsInput)
 EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_INPUT, MainWindow::OnOptionsInput)
-<<<<<<< camera
 EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_CAMERA, MainWindow::OnOptionsInput)
-=======
 EVT_MENU(MAINFRAME_MENU_ID_OPTIONS_MAC_SETTINGS, MainWindow::OnOptionsInput)
->>>>>>> main
 // tools menu
 EVT_MENU(MAINFRAME_MENU_ID_TOOLS_MEMORY_SEARCHER, MainWindow::OnToolsInput)
 EVT_MENU(MAINFRAME_MENU_ID_TOOLS_TITLE_MANAGER, MainWindow::OnToolsInput)