phase-functions: remove conflict markers

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 75f166473e253f4d201b7ca3aaa77e69c749a871..40decb75d8b08c66406fd790d78766b8c296f3db 100644 (file)
--- 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.