[Bf-blender-cvs] [37c56e1] master: Revert "ignore conflict files"

[Campbell Barton]

Commit: 37c56e10cdf2a132bec36eb138f416f02c22623f
Author: Campbell Barton
Date:   Fri Aug 8 06:00:40 2014 +1000
Branches: master
https://developer.blender.org/rB37c56e10cdf2a132bec36eb138f416f02c22623f

Revert "ignore conflict files"

This reverts commit 7d20ad6a1ba46cad209d17d144af1cffbab334fc.

turns out this hides conflicts which we may want to see

===================================================================

M	.gitignore

===================================================================

diff --git a/.gitignore b/.gitignore
index 21a07b8..b172c44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,10 +11,6 @@ __pycache__/
 *.swo
 *#
 
-# conflicts
-*.orig
-*.rej
-
 # QtCreator
 CMakeLists.txt.user