ignore conflict files
This commit is contained in:
parent
9a8e889dfc
commit
7d20ad6a1b
4
.gitignore
vendored
4
.gitignore
vendored
@ -11,6 +11,10 @@ __pycache__/
|
||||
*.swo
|
||||
*#
|
||||
|
||||
# conflicts
|
||||
*.orig
|
||||
*.rej
|
||||
|
||||
# QtCreator
|
||||
CMakeLists.txt.user
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user