summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCtibor Brančík <ctibor@brancik.cz>2021-09-17 14:33:35 +0200
committerCtibor Brančík <ctibor@brancik.cz>2021-09-17 14:33:35 +0200
commit8f8d998e1c6df51ed237095538649a4b7331a712 (patch)
tree03e2dfe2d8e890761f0119f631a9926b5c903c28
parented65ec9ec7a18670c42f6a4df30dfc72dbb344dd (diff)
downloadbrancik-overlay-8f8d998e1c6df51ed237095538649a4b7331a712.tar.gz
brancik-overlay-8f8d998e1c6df51ed237095538649a4b7331a712.tar.bz2
Fix artifacts in @kde-packages
-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