summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/package.mask1
1 files changed, 0 insertions, 1 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index bae9a74773d4..449e9c53c8d0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -238,7 +238,6 @@ x11-wm/matchbox-window-manager
x11-themes/matchbox-themes-extra
x11-wm/matchbox
x11-misc/matchbox-keyboard
->>>>>>> 603aa10... profiles/package.mask: Mask some packages for removal
# Matthias Maier <tamiko@gentoo.org> (06 Jan 2016)
# Obsolete package, nowadays bundled with media-sound/quodlibet