ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-26 16:15:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ignore conflict files"

Browse source 
This reverts commit 7d20ad6a1b.

turns out this hides conflicts which we may want to see
This commit is contained in:
Campbell Barton 2014-08-08 06:00:40 +10:00
parent 7d20ad6a1b
commit 37c56e10cd
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -11,10 +11,6 @@ __pycache__/
*.swo
*#
# conflicts
*.orig
*.rej
# QtCreator
CMakeLists.txt.user