diff options
| author | plegall <plg@piwigo.org> | 2015-12-10 14:02:22 +0100 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2015-12-10 14:02:22 +0100 |
| commit | fa10e0945ecd45bfe78a2c8fb015a43092b4944b (patch) | |
| tree | 19cf59c08877e43325efbe9a2584114011a25522 /include/smarty/.gitattributes | |
| parent | 16f6a54fa719cc79ff942e4bb8139d7ca09ed997 (diff) | |
bug #385 update to smarty-3.1.28-dev (from Github)
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 |