From 28011f511d8aaa709b45f42a36f64320cbfe01e0 Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Thu, 1 Sep 2005 12:22:43 +0000 Subject: [PATCH] Fixing package.mask, someone commited an collision to package.mask --- profiles/package.mask | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 04abc93d32f0..7afbf67ce02f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ ##################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.4369 2005/09/01 11:55:46 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.4370 2005/09/01 12:22:43 phreak Exp $ # When you add an entry to this file, add your name, the date, and an # explanation of why something is getting masked # @@ -697,15 +697,12 @@ media-sound/ipodder # Markus Nigbur (01 Jul 2005) # Masked due to a pretty big bug with crosscompile support. -<<<<<<< package.mask =sys-devel/distcc-2.18.3-r8 # Colin Kingsley (30 Jun 2005) # Major revisions. Masked for testing. >app-portage/mirrorselect-1.0.3 -======= =sys-devel/distcc-2.18.3-r8 ->>>>>>> 1.4189 # Aaron Walker (30 Jun 2005) # Masked due to constant security bugs. -- 2.26.2