From: Méven Car <meven@kde.org>
Date: Sun, 10 Sep 2023 13:24:39 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into kf6
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/4cbeb81b2b8e2d37c93cda4d88787e08e0658291

Merge remote-tracking branch 'origin/master' into kf6
---

4cbeb81b2b8e2d37c93cda4d88787e08e0658291
diff --cc src/settings/contextmenu/contextmenusettingspage.cpp
index 5e755d249,23ddfba31..1c83e477e
--- a/src/settings/contextmenu/contextmenusettingspage.cpp
+++ b/src/settings/contextmenu/contextmenusettingspage.cpp
@@@ -7,9 -7,9 +7,8 @@@
  #include "contextmenusettingspage.h"
  
  #include "dolphin_contextmenusettings.h"
- #include "dolphin_generalsettings.h"
  #include "dolphin_versioncontrolsettings.h"
  #include "global.h"
 -#include "settings/serviceitemdelegate.h"
  #include "settings/servicemodel.h"
  
  #include <KDesktopFile>