fix .gitignore merge conflict
This commit is contained in:
parent
023405c76a
commit
75bd759108
1 changed files with 3 additions and 0 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,3 +1,6 @@
|
|||
._*
|
||||
.idea/
|
||||
|
||||
# Python
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue