Fix merge conflicts

2019-03-04 22:32:51 +01:00 · 2019-03-04 22:32:51 +01:00 · 90b42ca6fb
commit 90b42ca6fb
parent 645b65c34e 8235a7e870
47 changed files with 1682 additions and 201 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,4 +1,5 @@
 language: python
+cache: pip
 python:
  - "3.6"
 sudo: false