removed cvs indicator

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