solve merge conflicts

nextmcloud · Aug 16, 2024 · d1ad529 · d1ad529
1 parent f372ba0
commit d1ad529
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 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
@@ -61,12 +61,9 @@ int main(int argc, char **argv)
 
     bool resourceLoaded = false;
     const QString currentPath = QDir::currentPath();
-    if(Utility::isMac())
-    {
+    if(Utility::isMac()) {
         resourceLoaded = QResource::registerResource(QDir::toNativeSeparators("/Applications/MagentaCLOUD.app/Contents/Resources/nmctheme_v1.rcc"));
-    }
-    else if(Utility::isWindows() || !resourceLoaded)
-    {
+    } else if(Utility::isWindows() || !resourceLoaded) {
         resourceLoaded = QResource::registerResource(QDir::toNativeSeparators(currentPath + "/nmctheme_v1.rcc"));
     }
 
@@ -200,4 +197,4 @@ int main(int argc, char **argv)
     }
 
     return app.exec();
-}
+}