From c1134b0c2ed25cae901127d8a31e7b3f078238d4 Mon Sep 17 00:00:00 2001
From: Pacho Ramos <pacho@gentoo.org>
Date: Wed, 6 Jan 2016 15:17:43 +0100
Subject: profiles/package.mask: Clean cruft

---
 profiles/package.mask | 1 -
 1 file changed, 1 deletion(-)

(limited to 'profiles')

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
-- 
cgit v1.2.3-65-gdbad