diff options
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 18f4b2447c..68f32f5d66 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,9 @@ chef/distro/common/html/* merge=ignore chef/distro/common/man/man1/* merge=ignore chef/distro/common/man/man8/* merge=ignore +chef/lib/chef/version.rb merge=ignore +chef-solr/lib/chef/solr/version.rb merge=ignore +chef-server/lib/chef-server/version.rb merge=ignore +chef-server-webui/lib/chef-server-webui/version.rb merge=ignore +chef-server-api/lib/chef-server-api/version.rb merge=ignore +chef-expander/lib/chef/expander/version.rb merge=ignore |