fix conflict
This commit is contained in:
commit
16f1489454
2
.gitignore
vendored
2
.gitignore
vendored
@ -108,3 +108,5 @@ ENV/
|
||||
|
||||
# mypy
|
||||
.mypy_cache/
|
||||
*.egg-info
|
||||
dist/
|
||||
|
Loading…
x
Reference in New Issue
Block a user