SOlve merge conflicts

nextmcloud · Feb 20, 2024 · d3a2d3e · d3a2d3e
1 parent 0727b87
commit d3a2d3e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
@@ -24,6 +24,7 @@
 #include "progressdispatcher.h"
 #include "owncloudgui.h"
 #include "accountmanager.h"
+#include "nmcgui/nmcnetworksettings.h"
 
 #include <QLabel>
 #include <QStandardItemModel>
@@ -39,7 +40,6 @@
 #include <QWidgetAction>
 #include <QPainter>
 #include <QPainterPath>
-#include "nmcgui/nmcnetworksettings.h"
 
 namespace {
 const QString TOOLBAR_CSS()