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)
commit37c56e10cdf2a132bec36eb138f416f02c22623f
tree430a99fa1a96930467e6c1d00dd54fe40eaee270
parent7d20ad6a1ba46cad209d17d144af1cffbab334fc
Revert "ignore conflict files"

This reverts commit 7d20ad6a1ba46cad209d17d144af1cffbab334fc.

turns out this hides conflicts which we may want to see
.gitignore