summaryrefslogtreecommitdiff
path: root/sets
diff options
context:
space:
mode:
Diffstat (limited to 'sets')
-rw-r--r--sets/kde-packages3
1 files changed, 0 insertions, 3 deletions
diff --git a/sets/kde-packages b/sets/kde-packages
index 9b43496..7f886e7 100644
--- a/sets/kde-packages
+++ b/sets/kde-packages
@@ -68,13 +68,10 @@ kde-plasma/kwayland-integration
kde-plasma/kwin
kde-plasma/plasma-browser-integration
kde-plasma/plasma-desktop
-<<<<<<< HEAD
kde-plasma/plasma-firewall
-=======
kde-plasma/plasma-disks
kde-plasma/plasma-systemmonitor
kde-plasma/plasma-vault
->>>>>>> b1cc4552536e5a5e37ebdc3e2c73dee37ff57a85
kde-plasma/plasma-workspace
kde-plasma/plymouth-kcm
media-gfx/digikam