From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 9 Dec 2011 20:36:14 +0000 (+0100)
Subject: phase-functions: remove conflict markers
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0428b8e125d86a080d385ff7db5a95e4813fc7d2;p=portage.git

phase-functions: remove conflict markers
---

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 75f166473..40decb75d 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.