reintroduce things skipped on conflict
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,5 +1,7 @@
|
||||
*py[co]
|
||||
|
||||
.idea/
|
||||
|
||||
# Test scripts
|
||||
*.sh
|
||||
|
||||
|
Reference in New Issue
Block a user