diff --git a/.gitattributes b/.gitattributes index 398f44a3e..93f2d4dde 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 \ No newline at end of file +*.pyc binary