From 33705d776e29344c5f8d70e36bb36a8a014c6505 Mon Sep 17 00:00:00 2001
From: Smiril <Smiril@users.noreply.github.com>
Date: Sat, 11 May 2024 23:25:51 +0200
Subject: [PATCH] Update CMakeLists.txt

---
 source/launcher/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/launcher/CMakeLists.txt b/source/launcher/CMakeLists.txt
index 112539c..42768f8 100644
--- a/source/launcher/CMakeLists.txt
+++ b/source/launcher/CMakeLists.txt
@@ -47,6 +47,10 @@ endif()
 
 add_dependencies(launcher KytyGitVersion)  
 
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
 set(launcher_name "launcher")
 
 set_target_properties(launcher PROPERTIES OUTPUT_NAME ${launcher_name})