summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2004-07-31 19:11:52 +0000
committerMamoru Komachi <usata@gentoo.org>2004-07-31 19:11:52 +0000
commit074b6cfdaefeef8f74b13fcdd1fc97d9099345e9 (patch)
tree8a371392846b8d902762863acc4a4f6d81e703f4 /profiles
parent~amd64 - closes bug #57702 (Manifest recommit) (diff)
downloadgentoo-2-074b6cfdaefeef8f74b13fcdd1fc97d9099345e9.tar.gz
gentoo-2-074b6cfdaefeef8f74b13fcdd1fc97d9099345e9.tar.bz2
gentoo-2-074b6cfdaefeef8f74b13fcdd1fc97d9099345e9.zip
Fixed broken entries.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/default-macos-10.3/packages.build5
1 files changed, 0 insertions, 5 deletions
diff --git a/profiles/default-macos-10.3/packages.build b/profiles/default-macos-10.3/packages.build
index fd3667094ea6..1886434319c1 100644
--- a/profiles/default-macos-10.3/packages.build
+++ b/profiles/default-macos-10.3/packages.build
@@ -267,11 +267,6 @@ sys-libs/pam-1.9
sys-libs/pam-modules-13
sys-libs/yacc-1.1.4
sys-libs/zlib-1.1.4
-<<<<<<< packages.build
-sys-darwin/X11-4.3.99
-sys-apps/sed-4.0.7
-=======
sys-apps/diffutils-2.5.7
x11-base/apple-xfree-4.3
->>>>>>> 1.8
sys-apps/sed-4.0.7