solve merge conflicts

nextmcloud · Aug 16, 2024 · dacb269 · dacb269
1 parent 7e73aea
commit dacb269
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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)
diff --git 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)
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
@@ -197,4 +197,4 @@ int main(int argc, char **argv)
     }
 
     return app.exec();
-}
+}