summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2016-01-06 15:17:43 +0100
committerPacho Ramos <pacho@gentoo.org>2016-01-06 15:17:43 +0100
commitc1134b0c2ed25cae901127d8a31e7b3f078238d4 (patch)
tree5f16de6a8ed34b8bd3e24f1c98c176e4e949c881 /profiles/package.mask
parentprofiles/package.mask: Mask some packages for removal (diff)
downloadgentoo-c1134b0c2ed25cae901127d8a31e7b3f078238d4.tar.gz
gentoo-c1134b0c2ed25cae901127d8a31e7b3f078238d4.tar.bz2
gentoo-c1134b0c2ed25cae901127d8a31e7b3f078238d4.zip
profiles/package.mask: Clean cruft
Diffstat (limited to 'profiles/package.mask')
-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