diff --git a/.gitattributes b/.gitattributes index 977f6615376..c769d7fc047 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,4 +12,4 @@ html/changelog.html merge=union # enforced LF * text=auto -*. merge= \ No newline at end of file +*. merge=