try to solve merge conflict

nextmcloud · Jul 11, 2024 · 542bf4f · 542bf4f
1 parent 4ac834a
commit 542bf4f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
@@ -24,7 +24,6 @@
 #include "progressdispatcher.h"
 #include "owncloudgui.h"
 #include "accountmanager.h"
-#include "nmcgui/nmcnetworksettings.h"
 
 #include <QLabel>
 #include <QStandardItemModel>
@@ -41,6 +40,8 @@
 #include <QPainter>
 #include <QPainterPath>
 
+#include "nmcgui/nmcnetworksettings.h"
+
 namespace {
 const QString TOOLBAR_CSS()
 {