Resolve .gitignore merge conflict; consolidate ignore rules
This commit is contained in:
21
.gitignore
vendored
21
.gitignore
vendored
@@ -1,12 +1,9 @@
|
||||
*.csv
|
||||
.vscode
|
||||
instance
|
||||
venv/
|
||||
__pycache__
|
||||
123
|
||||
*.csv
|
||||
*.db
|
||||
c*.txt
|
||||
|
||||
migrations/*
|
||||
.idea
|
||||
.vscode
|
||||
.idea
|
||||
venv/
|
||||
instance/
|
||||
__pycache__/
|
||||
migrations/
|
||||
*.csv
|
||||
*.db
|
||||
c*.txt
|
||||
|
||||
Reference in New Issue
Block a user