[gentoo-commits] proj/portage:prefix commit in: bin/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     0428b8e125d86a080d385ff7db5a95e4813fc7d2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 20:36:14 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 20:36:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0428b8e1

phase-functions: remove conflict markers

---
 bin/phase-functions.sh |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 75f1664..40decb7 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -559,9 +559,6 @@ dyn_install() {
 	fi
 	echo "${USE}"       > USE
 	echo "${EAPI:-0}"   > EAPI
-<<<<<<< HEAD
-	echo "${EPREFIX}"   > EPREFIX
-=======
 
 	# Save EPREFIX, since it makes it easy to use chpathtool to
 	# adjust the content of a binary package so that it will
@@ -576,7 +573,6 @@ dyn_install() {
 			;;
 	esac
 
->>>>>>> overlays-gentoo-org/master
 	set +f
 
 	# local variables can leak into the saved environment.