diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-08-08 00:00:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-08 00:00:49 +0400 |
| commit | 37c56e10cdf2a132bec36eb138f416f02c22623f (patch) | |
| tree | 430a99fa1a96930467e6c1d00dd54fe40eaee270 /.gitignore | |
| parent | 7d20ad6a1ba46cad209d17d144af1cffbab334fc (diff) | |
Revert "ignore conflict files"
This reverts commit 7d20ad6a1ba46cad209d17d144af1cffbab334fc.
turns out this hides conflicts which we may want to see
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 0 insertions, 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 |