diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2006-08-12 14:15:44 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2006-08-12 14:15:44 +0000 |
| commit | 0c10ac72aaf5b891641bb07a44d6a272f10b9d59 (patch) | |
| tree | b69d742fdfbc0695c7749917b76e8a416fc0680a /profiles | |
| parent | Stable on ppc64; bug #136695 (diff) | |
| download | gentoo-2-0c10ac72aaf5b891641bb07a44d6a272f10b9d59.tar.gz gentoo-2-0c10ac72aaf5b891641bb07a44d6a272f10b9d59.tar.bz2 gentoo-2-0c10ac72aaf5b891641bb07a44d6a272f10b9d59.zip | |
remove the cvs commit clash
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/package.mask | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/profiles/package.mask b/profiles/package.mask index a79add569b32..ebf2885537a5 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ ##################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.5724 2006/08/12 13:20:08 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.5725 2006/08/12 14:15:44 seemant Exp $ # When you add an entry to this file, add your name, the date, and an # explanation of why something is getting masked # @@ -613,7 +613,6 @@ games-mud/kmc # Security mask; bug #112791. sys-kernel/kurobox-sources -<<<<<<< package.mask # Fernando J. Pereda <ferdy@gentoo.org> (18 May 2006) # This ebuild is for patch testing purposes. Things might break. >=mail-client/mutt-1.5.11-r30 @@ -633,8 +632,6 @@ sys-kernel/kurobox-sources =games-strategy/boson-0.11-r1 =games-strategy/scorched3d-39.1-r1 -======= ->>>>>>> 1.5723 # Roy Marples <uberlord@gentoo.org> (09 May 2006) # Masked for testing, although it works very well for me. >=net-misc/openvpn-2.1_beta |