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