diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-27 20:00:13 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-27 20:00:13 +0300 |
| commit | 422b99ed87cab7b6acdb86be0a8b424db1213af2 (patch) | |
| tree | 2542efed19eae8cb03f52cc363966f1ddbe83811 /.gitattributes | |
| parent | 8cd08717f6eecd1a7b5c58349d2c8da52e985156 (diff) | |
| download | mariadb-git-422b99ed87cab7b6acdb86be0a8b424db1213af2.tar.gz | |
Fix incorrect merge.
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions