Do not stick random things in files CVS, you are making me look bad.

diff --git a/profiles/package.mask b/profiles/package.mask
index fc484cb52c47b4ea6772cdee6dc9a5f18eed6630..4ff93791c6154e4a65884892dc0f91c09d0603e1 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11606 2010/06/08 23:45:45 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11607 2010/06/08 23:54:00 chainsaw Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,7 +31,6 @@
 
 #--- END OF EXAMPLES ---
 
-<<<<<<< package.mask
 # Tony Vroon <chainsaw@gentoo.org> (09 Jun 2010)
 # Alpha releases, should you wish to dip your toes in the 
 # water... please be aware of the sharks.
@@ -40,7 +39,6 @@
 =media-plugins/audacious-plugins-2.4_alpha*
 =media-sound/audacious-2.4_alpha*
 
-=======
 # Stanislav Ochotnicky <sochotnicky@gentoo.org> (08 Jun 2010)
 #
 # Ebuild failing after recent python changes. Needs changes, dead
@@ -49,7 +47,6 @@
 # Masked for removal in 30 days (bz323269)
 net-p2p/Circle
 
->>>>>>> 1.11604
 # Markos Chandras <hwoarang@gentoo.org> (07 Jun 2010)
 # Masking 4.6.3 until we are ready for that
 ~x11-libs/qt-assistant-4.6.3