Fix rebase

dev/bootstrap.sh

@@ -55,18 +55,11 @@ if $DO_SSTATE ; then
 fi
 
 if $DO_DEPLOY ; then
-<<<<<<< HEAD
     DEPLOY_PATH="deploy"
     mkdir -p $DEPLOY_PATH
     rm -rf "$DEPLOY_PATH"/*
     deploy_param1="-v"
     deploy_param2="${PWD}"/"${DEPLOY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}"
-=======
-    DEPLOY_PATH="deploy-rpms"
-    mkdir -p $DEPLOAY_PATH
-    deploy_param1="-v"
-    deploy_param2="${PWD}"/"${DEPOLY_PATH}":"${YOCTO_WORKDIR}"/"${DEPLOY_PATH}"
->>>>>>> b6d3ef2 (Implement basic yocto build setup based on protos from jhnc-oss)
 fi
 
 
@@ -88,18 +81,9 @@ podman run \
   -v "${PWD}"/default.xml:"${YOCTO_WORKDIR}"/default.xml \
   -v "${PWD}"/meta-caros:"${YOCTO_WORKDIR}"/meta-caros:Z \
   -v "${PWD}"/dev:"${YOCTO_WORKDIR}"/dev:Z \
-<<<<<<< HEAD
   -v "${PWD}"/downloads:"${YOCTO_WORKDIR}"/downloads:Z \
   --env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \
   --env SSTATE_PATH="${SSTATE_PATH}" \
   ${CONTAINER_NAME} \
   ghcr.io/jhnc-oss/yocto-image/yocto:37 \
-=======
-  -v "${PWD}"/download:"${YOCTO_WORKDIR}"/download:Z \
-  -v "${PWD}"/sstate:"${YOCTO_WORKDIR}"/sstate:Z \
-  --env TEMPLATECONF="${YOCTO_WORKDIR}"/meta-caros/conf/templates \
-  --env SSTATE_PATH="${SSTATE_PATH}" \
-  ${CONTAINER_NAME} \
-  ghcr.io/jhnc-oss/yocto-image/yocto:38 \
->>>>>>> b6d3ef2 (Implement basic yocto build setup based on protos from jhnc-oss)
   bash -c "dev/init_env.sh "