diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index bb9914a8b6..3122278bd5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,3 +4,4 @@ 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 |