diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-23 15:27:59 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-23 15:27:59 +0000 |
| commit | 3c74ac9055936c6efe9a2388f7e9c53bc1c7b0d8 (patch) | |
| tree | 6de8e70412d90753679ab4dbc594cff8ba06c3a0 /profiles | |
| parent | Stable on alpha, bug #297079 (diff) | |
| download | gentoo-2-3c74ac9055936c6efe9a2388f7e9c53bc1c7b0d8.tar.gz gentoo-2-3c74ac9055936c6efe9a2388f7e9c53bc1c7b0d8.tar.bz2 gentoo-2-3c74ac9055936c6efe9a2388f7e9c53bc1c7b0d8.zip | |
Remove wrongly merged collision.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/package.mask | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/profiles/package.mask b/profiles/package.mask index 1faf5982106b..515ae60f2bf0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11145 2010/01/23 15:06:23 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11146 2010/01/23 15:27:59 scarabeus 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 @@ -622,10 +622,6 @@ sys-auth/nsvs # Beta versions of sudo =app-admin/sudo-1.7.3_beta* -# Luca Barbato <lu_zero@gentoo.org (07 Dec 2009) -# bad regression https://bugs.gentoo.org/287725 -=media-libs/netpbm-10.48.00 - # Diego E. Pettenò <flameeyes@gentoo.org> (06 Dec 2009) # on behalf of QA team # |