forked from bartvdbraak/blender
Revert "ignore conflict files"
This reverts commit 7d20ad6a1ba46cad209d17d144af1cffbab334fc. turns out this hides conflicts which we may want to see
This commit is contained in:
parent
7d20ad6a1b
commit
37c56e10cd
4
.gitignore
vendored
4
.gitignore
vendored
@ -11,10 +11,6 @@ __pycache__/
|
||||
*.swo
|
||||
*#
|
||||
|
||||
# conflicts
|
||||
*.orig
|
||||
*.rej
|
||||
|
||||
# QtCreator
|
||||
CMakeLists.txt.user
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user