Cleanup: pep8
[blender.git] / .gitignore
index 21a07b8c0401291cfbf65c35e6d5aa8f599a255e..b172c446553e348c7b350bd89559a164c7de4ef1 100644 (file)
@@ -11,10 +11,6 @@ __pycache__/
 *.swo
 *#
 
-# conflicts
-*.orig
-*.rej
-
 # QtCreator
 CMakeLists.txt.user