Merge #3471 Use CRLF for resx files

KSP-CKAN · Nov 17, 2021 · 35927bc · 35927bc
2 parents a748a76 + 8d6f2b5
commit 35927bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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