diff options
author | plegall <plg@piwigo.org> | 2016-02-01 10:20:57 +0100 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2016-02-01 10:20:57 +0100 |
commit | da8d2b2af0e38715a929b3d4b900ee793cdfb3e8 (patch) | |
tree | 386658eb909674adbb0c2afbe756bdbf9a895d37 /include/smarty/.gitattributes | |
parent | 70726892e031553563899783d9caab4d2c2e5b65 (diff) | |
parent | 2fcf276811723d300b4d4c08675994339a6688fa (diff) |
Merge branch 'master' into translation
Diffstat (limited to 'include/smarty/.gitattributes')
-rw-r--r-- | include/smarty/.gitattributes | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/include/smarty/.gitattributes b/include/smarty/.gitattributes new file mode 100644 index 000000000..412eeda78 --- /dev/null +++ b/include/smarty/.gitattributes @@ -0,0 +1,22 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain |