fix CacheControl conflict

gijzelaerr · gijzelaerr · commit 21bc3b54e7be · 2019-01-16T10:17:51.000+02:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,4 @@
+.venv/
+*.egg-info/
+build/
+dist/
diff --git a/.travis/py3.docker b/.travis/py3.docker
@@ -2,4 +2,5 @@ FROM kernsuite/base:5
 RUN docker-apt-install python3-pip
 ADD . /code
 WORKDIR /code
+RUN pip3 install CacheControl==0.11.7
 RUN pip3 install .
diff --git a/cwl_utils/__init__.py b/cwl_utils/__init__.py

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +.venv/
 +*.egg-info/
 +build/
 +dist/