From 7dd0b13408a278da6ad2de9ae4d217e9ecf4c45a Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Fri, 22 Nov 2019 16:53:38 -0330 Subject: [PATCH] Add EOL conversion to gitattributes (#7494) --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 590ac71c0..561741e37 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ +* text=auto CHANGELOG.md merge=union # Reviewing the lockfile contents is an important step in verifying that