resolved last conflict

MG-RAST · Apr 16, 2019 · 210a467 · 210a467
1 parent 05256c1
commit 210a467
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -52,12 +52,9 @@ RUN apt-get update && apt-get install -y \
  wget \
  vim \
  curl \
-<<<<<<< HEAD
  && strip /usr/local/bin/* ; exit 0 && \\
  apt-get clean
-=======
- && apt-get clean
->>>>>>> 8a5ded15fad8ee1a4315aef1fdc1d53cdcdc12b8
+
 
 #### install BLAT from src
 RUN cd /root \
@@ -165,7 +162,8 @@ RUN cd /root \
  && cd /root ; rm -rf autoskewer
 
 ### install CWL runner
-RUN pip install --upgrade pip && pip install --upgrade cwlref-runner typing
+RUN pip install --upgrade pip
+RUN pip install --upgrade cwlref-runner typing
 
 # copy files into image
 COPY CWL /CWL/