| 1 |
commit: 550783cc265cc2851af2e80011de49917c1397f2 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 2 14:00:18 2011 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 2 14:00:18 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=550783cc |
| 7 |
|
| 8 |
Fix merge result |
| 9 |
|
| 10 |
--- |
| 11 |
bin/ebuild.sh | 1 - |
| 12 |
1 files changed, 0 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/bin/ebuild.sh b/bin/ebuild.sh |
| 15 |
index aebdb17..2aae318 100755 |
| 16 |
--- a/bin/ebuild.sh |
| 17 |
+++ b/bin/ebuild.sh |
| 18 |
@@ -156,7 +156,6 @@ if ! has "$EBUILD_PHASE" clean cleanrm depend help ; then |
| 19 |
cd "$PORTAGE_BUILDDIR" || \ |
| 20 |
die "PORTAGE_BUILDDIR does not exist: '$PORTAGE_BUILDDIR'" |
| 21 |
fi |
| 22 |
->>>>>>> v2.2.0_alpha58 |
| 23 |
|
| 24 |
#if no perms are specified, dirs/files will have decent defaults |
| 25 |
#(not secretive, but not stupid) |
Archives