fix conflict

This commit is contained in:
Derek DeJonghe 2018-05-25 14:15:28 -04:00
commit 16f1489454

2
.gitignore vendored
View File

@ -108,3 +108,5 @@ ENV/
# mypy
.mypy_cache/
*.egg-info
dist/