From 9d36dda057f6331357d3a70e0868606ae5e62ab0 Mon Sep 17 00:00:00 2001
From: Guillaume Destuynder <kang@gentoo.org>
Date: Thu, 16 Nov 2006 13:42:11 +0000
Subject: [PATCH] removed cvs indicator

---
 profiles/package.mask | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index a7ce84b8be4d..c3607ae66100 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 #####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.6273 2006/11/16 13:41:11 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.6274 2006/11/16 13:42:11 kang Exp $
 # When you add an entry to this file, add your name, the date, and an
 # explanation of why something is getting masked
 #
@@ -121,7 +121,6 @@ x11-plugins/replytolist
 =sys-apps/portage-2.1.1-r2
 
 # Alexis Ballier <aballier@gentoo.org< (07 Nov 2006)
->>>>>>> 1.6272
 # Needs some testing
 =media-libs/openexr-1.4.0a
 
-- 
2.26.2