From 210a46717d091c186235d211c1175f02d0a644b6 Mon Sep 17 00:00:00 2001
From: Folker Meyer <folker@anl.gov>
Date: Tue, 16 Apr 2019 11:36:05 -0500
Subject: [PATCH] resolved last conflict

---
 Dockerfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2fd6122..a3573c5 100644
--- 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/