diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-09-05 13:19:28 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-09-05 13:19:28 +0200 |
| commit | 2140dcf66d7f430cbaba0cc47fe8d382574cc375 (patch) | |
| tree | 1fbc11217e1624756afab367998b70a7e4fbb1f6 /storage/connect | |
| parent | 213765cc222139c05c27774e0555cabeff7c3bbd (diff) | |
| parent | a14f61ef749ad9f9ab2b0f5badf6754ba7443c9e (diff) | |
| download | mariadb-git-2140dcf66d7f430cbaba0cc47fe8d382574cc375.tar.gz | |
Merge branch '10.0' of https://github.com/MariaDB/server into ob-10.0
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/.gitattributes | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/storage/connect/.gitattributes b/storage/connect/.gitattributes deleted file mode 100644 index d21fdf8f212..00000000000 --- a/storage/connect/.gitattributes +++ /dev/null @@ -1,25 +0,0 @@ -# Set the default behavior, in case people don't have core.autocrlf set. -* text=auto - -# Explicitly declare text files you want to always be normalized and converted -# to native line endings on checkout. -*.c text -*.cc text -*.cpp text -*.h text -*.test text - -# Declare files that will always have LF line endings on checkout. -*.result text eol=lf -mysql-test/connect/std_data/*.txt text eol=lf -mysql-test/connect/std_data/*.dat text eol=lf - -# Denote all files that are truly binary and should not be modified. -*.png binary -*.jpg binary - -*.c diff=cpp -*.h diff=cpp -*.cc diff=cpp -*.ic diff=cpp -*.cpp diff=cpp |