summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sets/kde-packages4
1 files changed, 4 insertions, 0 deletions
diff --git a/sets/kde-packages b/sets/kde-packages
index 772863d..9b43496 100644
--- a/sets/kde-packages
+++ b/sets/kde-packages
@@ -68,9 +68,13 @@ 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