Merge Conflict resolved.
This commit is contained in:
commit
c5602d1d59
|
|
@ -3,3 +3,4 @@
|
|||
*.swp
|
||||
.tox
|
||||
.cache
|
||||
.DS_Store
|
||||
|
|
|
|||
Loading…
Reference in New Issue