Fixed dockerfile

Author: lsierant

docker/mongodb-enterprise-tests/Dockerfile

@@ -37,8 +37,6 @@ RUN curl --fail --retry 3 -L -o "${HELM_NAME}" "https://get.helm.sh/${HELM_NAME}
     && rm "${HELM_NAME}" \
     && mv "linux-amd64/helm" "/usr/local/bin/helm"
 
-<<<<<<< Updated upstream
-=======
 ADD https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.12.0.tgz /tmp/mongodb-tools.tgz
 RUN mkdir -p /tmp/mongodb-tools && \
     tar xfz /tmp/mongodb-tools.tgz -C /tmp/mongodb-tools && \
@@ -49,7 +47,6 @@ RUN curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -
     && chmod +x ./kubectl \
     && mv ./kubectl /usr/local/bin/kubectl
 
->>>>>>> Stashed changes
 COPY --from=builder /venv /venv
 
 ENV PATH="/venv/bin:${PATH}"