summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-11 13:18:22 -0700
committerTim Smith <tsmith@chef.io>2018-03-11 13:18:22 -0700
commit7216ac7e617df192227e1633570ce977a29471a2 (patch)
treee117b08e9737678eb12e396b5acdc8e6747676ee /.gitattributes
parent84ea1415f0a31780d3ff03de340e32af23ff62c4 (diff)
downloadchef-7216ac7e617df192227e1633570ce977a29471a2.tar.gz
Remove the manpagesmanpages
These are horribly outdated and we shouldn't have people using them for decision making Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes3
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