Revert "ignore conflict files"
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Aug 2014 20:00:40 +0000 (06:00 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Aug 2014 20:00:49 +0000 (06:00 +1000)
This reverts commit 7d20ad6a1ba46cad209d17d144af1cffbab334fc.

turns out this hides conflicts which we may want to see

.gitignore

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