diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-05 23:24:39 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-05 23:24:39 +0200 |
commit | f8fa5fe1bc9023e0e9fac5b05515b94ed04289cb (patch) | |
tree | 44bff5f7c263003693720c2f0ba79f1ede0243c5 /.gitattributes | |
parent | 9dee994d992b3930f0d29197aed82771bf910c47 (diff) | |
parent | f7002c05ae4e4a09bc6859ccc568064cfd6bb268 (diff) | |
download | mariadb-git-f8fa5fe1bc9023e0e9fac5b05515b94ed04289cb.tar.gz |
Commit merge resolve
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index bb22871094a..24291691407 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,7 @@ # Explicitly declare text files you want to always be normalized and converted # to native line endings on checkout. *.c text +*.ic text *.cc text *.cpp text *.h text |