From 6de9bd4c69abe8bd1ed3e79eb6035aad55cb6d56 Mon Sep 17 00:00:00 2001 From: pughdr Date: Mon, 26 Aug 2019 12:50:24 +0300 Subject: [PATCH] Fixed merge conflict --- repo2docker/buildpacks/conda/install-miniconda.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo2docker/buildpacks/conda/install-miniconda.bash b/repo2docker/buildpacks/conda/install-miniconda.bash index b9a7d9ba..7f3005da 100755 --- a/repo2docker/buildpacks/conda/install-miniconda.bash +++ b/repo2docker/buildpacks/conda/install-miniconda.bash @@ -3,11 +3,11 @@ set -ex cd $(dirname $0) -MINICONDA_VERSION=4.6.14 +MINICONDA_VERSION=4.7.10 CONDA_VERSION=4.7.10 # Only MD5 checksums are available for miniconda # Can be obtained from https://repo.continuum.io/miniconda/ -MD5SUM="718259965f234088d785cad1fbd7de03" +MD5SUM="1c945f2b3335c7b2b15130b1b2dc5cf4" URL="https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh" INSTALLER_PATH=/tmp/miniconda-installer.sh