profiles/package.mask: Clean cruft

diff --git a/profiles/package.mask b/profiles/package.mask
index bae9a74773d433a7c5dd52b578a2e452d8570f24..449e9c53c8d0f5607f55c177e1b5a2ff52af25b9 100644 (file)
--- 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