use conda for now

docker/py/Dockerfile

@@ -62,7 +62,6 @@ RUN python3 -m pip install --no-cache-dir -U pip && \
     # npm cache clean --force && \
     rm -rf "/home/${NB_USER}/.cache"
 
-<<<<<<< HEAD
 # jupyter sets channel priority to strict which often causes very long error messages
 RUN mamba config --system --set channel_priority flexible && \
     mamba clean --all -f -y
@@ -71,13 +70,6 @@ RUN mamba config --system --set channel_priority flexible && \
 RUN mkdir -p "$HOME/.ssh" && \
     touch "$HOME/.ssh/authorized_keys" && \
     chmod u=rw,g=,o= "$HOME/.ssh/authorized_keys"
-=======
-# fix https://github.com/SwissDataScienceCenter/renku-jupyter/issues/14
-RUN mamba install -y gxx_linux-64 && \
-    # jupyter sets channel priority to strict which often causes very long error messages
-    conda config --system --set channel_priority flexible && \
-    mamba clean --all -f -y
->>>>>>> db03a95 (remove git-lfs=2.12.0 requirement)
 
 # install renku-python
 ENV RENKU_DISABLE_VERSION_CHECK 1