modified: env/install-eos.sh

diff --git a/env/install-eos.sh b/env/install-eos.sh
index c990b01..f7396b9 100755 (executable)
--- a/env/install-eos.sh
+++ b/env/install-eos.sh
@@ -204,17 +204,10 @@ if [ -d $EOS_HOME0/hostdepend ] ; then
                        git clone --depth 1 ${HOSTDEPEND_EOS_OSDN_SSH} ${EOS_HOSTDIR} || \
                        git clone --depth 1 ${HOSTDEPEND_EOS_OSDN_HTTPS} ${EOS_HOSTDIR} || \
                        echo "A port for SSH or HTTPS is not open, or something wrong."
-<<<<<<< HEAD
-                       cd ${EOS_HOSTDIR}; \
-                       git clone --unshallow ${HOSTDEPEND_EOS_OSDN_SSH} || \
-                       git clone --unshallow 1 ${HOSTDEPEND_EOS_OSDN_HTTPS} || \
-                       echo "cannot --unshallow something wrong."
-=======
                        cd ${EOS_HOSTDIR}; \
                        git clone --unshallow ${HOSTDEPEND_EOS_OSDN_SSH} || \
                        git clone --unshallow 1 ${HOSTDEPEND_EOS_OSDN_HTTPS} || \
                        echo "cannot --unshallow something wrong."
->>>>>>> ac9eb4b0ad6afc35d32bb8fd2c0c6c1d02e63778
                        INSTALL_FLAG=INSTALL
                fi
                if [ -z $INSTALL_FLAG ] ; then