summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Kinard <kumba@gentoo.org>2003-05-21 19:11:33 +0000
committerJoshua Kinard <kumba@gentoo.org>2003-05-21 19:11:33 +0000
commitd4d2f882e9d53c263a365385b3bfc7a23fc5bf0a (patch)
tree2e6b929f4ebe8b1125c9c150d81c7e31401f5bd0 /profiles
parentMarking stable (diff)
downloadhistorical-d4d2f882e9d53c263a365385b3bfc7a23fc5bf0a.tar.gz
historical-d4d2f882e9d53c263a365385b3bfc7a23fc5bf0a.tar.bz2
historical-d4d2f882e9d53c263a365385b3bfc7a23fc5bf0a.zip
Removed invalid characters from package.mask
Diffstat (limited to 'profiles')
-rw-r--r--profiles/package.mask3
1 files changed, 0 insertions, 3 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index e8198ebf753f..deabb0b5e03a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -643,11 +643,8 @@ app-admin/va-systemimager-client
# Seems we are back to square 1. libtool-1.4.2 needs autoconf-2.5
# or later .. masking 1.4.2 again and adding 1.4.1-r2 with the
# "relink bug" fixed.
-<<<<<<< package.mask
#>=sys-devel/libtool-1.4.2
-=======
=sys-devel/libtool-1.4.2-r2
->>>>>>> 1.2178
<sys-devel/libtool-1.4.1-r4
# We are masking out the older pams now, in order to get the