summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorUwe Tews <uwe.tews@googlemail.com>2017-10-09 10:13:52 +0200
committerUwe Tews <uwe.tews@googlemail.com>2017-10-09 10:13:52 +0200
commite25bc7a29103754460207effee71752700bcfd62 (patch)
treeef7d2fee5a9d099a9280b354c9247e33cc3818e5 /.gitattributes
parent9ad66c695d325e36520f993eaa7126a9d03670a4 (diff)
downloadsmarty-e25bc7a29103754460207effee71752700bcfd62.tar.gz
smarty-e25bc7a29103754460207effee71752700bcfd62.tar.bz2
smarty-e25bc7a29103754460207effee71752700bcfd62.zip
set error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT for PHP versions >= 7.0
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes22
1 files changed, 1 insertions, 21 deletions
diff --git a/.gitattributes b/.gitattributes
index 6ea6cbe8..4d3c3d8c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,29 +1,9 @@
# 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
-
# exclude from git export
/travis.ini export-ignore
-/composer.json export-ignore
+/myconfig.ini export-ignore
/.travis.yml export-ignore
/.gitignore export-ignore
/.gitattributes export-ignore