prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update gitattributes

Browse source
This commit is contained in:
Collin M. Barrett 2019-12-07 15:25:37 -06:00
parent a5736dd3b6
commit 05d8f1ced2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitattributes vendored
View file

@ -4,7 +4,7 @@
#common settings that generally should always be used with your language specific settings
# Auto detect text files and perform LF normalization
# https://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
# http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
* text=auto
#
@ -45,7 +45,7 @@
#*.svg text
*.eps binary
# Auto detect text files and perform LF normalization
# https://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
# http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
* text=auto
*.cs diff=csharp
@ -60,7 +60,7 @@
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just comment the entries below and
@ -293,4 +293,4 @@ Procfile text
## EXECUTABLES
*.exe binary
*.pyc binary
*.pyc binary