diff --git a/.gitattributes b/.gitattributes index 27f4751ab2..833392b63c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -28,7 +28,7 @@ *.config text *.crt text *.DotSettings text -*.resx text +*.resx text eol=crlf *.settings text # CKAN files diff --git a/CHANGELOG.md b/CHANGELOG.md index cf3ccd2eba..61aafdcb46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ All notable changes to this project will be documented in this file. - [ConsoleUI] Keep dependencies in the box in ConsoleUI (#3459 by: HebaruSan; reviewed: DasSkelett) - [GUI] French translation bits in label dialog (#3465 by: vinix38; reviewed: HebaruSan) - [GUI] Suppress filter updates for unchanged semantic search meaning (#3435 by: HebaruSan; reviewed: DasSkelett) +- [GUI] Use CRLF for resx files (#3471 by: HebaruSan; reviewed: DasSkelett) ### Internal