Fix compile failure

I should probably avoid committing merge failures.

Fix compile failure
I should probably avoid committing merge failures.
9a4716e9 · Nate Graham · 27c6a28f · 9a4716e9
Commit 9a4716e9 authored Jun 10, 2020 by Nate Graham
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,11 +28,7 @@ include(KDEClangFormat)
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
                    Plasma DocTools Runner Notifications NotifyConfig Su NewStuff Wallet
                    IdleTime Declarative I18n KCMUtils TextWidgets KDELibs4Support Crash GlobalAccel
-<<<<<<< HEAD
-                    DBusAddons Wayland CoreAddons People ActivitiesStats Activities)
-=======
-                    DBusAddons Wayland CoreAddons People ActivitiesStats KIO)
->>>>>>> Plasma/5.19
+                    DBusAddons Wayland CoreAddons People ActivitiesStats Activities KIO)
 find_package(KDED CONFIG REQUIRED)

 find_package(KF5NetworkManagerQt ${KF5_MIN_VERSION})