From 37c56e10cdf2a132bec36eb138f416f02c22623f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 8 Aug 2014 06:00:40 +1000
Subject: [PATCH] Revert "ignore conflict files"

This reverts commit 7d20ad6a1ba46cad209d17d144af1cffbab334fc.

turns out this hides conflicts which we may want to see
---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

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