From dacb269c4d3473d2f537bcd61ce4c4a653200d9b Mon Sep 17 00:00:00 2001
From: Mauro Mura <Mauro-Efisio.Mura@t-systems.com>
Date: Fri, 16 Aug 2024 07:55:42 +0200
Subject: [PATCH] solve merge conflicts

---
 CMakeLists.txt         | 2 +-
 src/gui/CMakeLists.txt | 2 +-
 src/gui/main.cpp       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c291b9c45945..61c79759cd43e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,4 +312,4 @@ elseif(BUILD_CLIENT)
     configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
 endif()
 
-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES)
\ No newline at end of file
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 43e6550abf676..2da46bad1e5e6 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -793,4 +793,4 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT WIN32)
     endif(SharedMimeInfo_FOUND)
 endif()
 
-configure_file(configgui.h.in ${CMAKE_CURRENT_BINARY_DIR}/configgui.h)
+configure_file(configgui.h.in ${CMAKE_CURRENT_BINARY_DIR}/configgui.h)
\ No newline at end of file
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 0a2cb4a74b9ba..bc062b1a878a4 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -197,4 +197,4 @@ int main(int argc, char **argv)
     }
 
     return app.exec();
-}
+}
\ No newline at end of file