diff --git a/.gitattributes b/.gitattributes index b0eba6f06..18290bc58 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ dist/ merge=ours app/Language/**/*.php merge=ours -text=auto +text=auto eol=lf