diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index 3122278bd5..311062a0b3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,4 @@ # git config merge.ignore.name 'ignore changes merge driver' # git config merge.ignore.driver 'touch %A' -distro/common/html/* merge=ignore -distro/common/man/man1/* merge=ignore -distro/common/man/man8/* merge=ignore lib/chef/version.rb merge=ignore *.reg text eol=crlf
\ No newline at end of file |