ignore merge conflict backup files
This commit is contained in:
parent
5b1042dd57
commit
ce4c3f3f3c
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,3 +7,4 @@ xml/PenText.xpr
|
||||
*.pyc
|
||||
|
||||
.DS_Store
|
||||
*.orig
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user