ignore conflict files
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Aug 2014 19:47:15 +0000 (05:47 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Aug 2014 19:47:15 +0000 (05:47 +1000)
.gitignore

index b172c44..21a07b8 100644 (file)
@@ -11,6 +11,10 @@ __pycache__/
 *.swo
 *#
 
+# conflicts
+*.orig
+*.rej
+
 # QtCreator
 CMakeLists.txt.user