a15b054d0a
Conflicts: .gitignore
9 lines
102 B
Plaintext
9 lines
102 B
Plaintext
*.pyc
|
|
*.egg-info
|
|
.DS_Store
|
|
docs/_build
|
|
/build
|
|
/dist
|
|
|
|
>>>>>>> aee2b719b27498f1b3dcbb1909a8443ff6d1cf9f
|