From 876cc15a9b9e25a94850c3cbf889f7bcac93e6eb Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Tue, 12 Oct 2021 07:25:50 +0200 Subject: [PATCH] Merge branch 'merging' into development # Conflicts: # .gitattributes --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 1fa77fa7..1bf56775 100644 --- a/.gitattributes +++ b/.gitattributes @@ -26,5 +26,4 @@ *.props filter= diff= merge= text eol=crlf *.inl filter= diff= merge= text eol=crlf *.flm filter= diff= merge= text eol=crlf -*.dlstrings filter= diff= merge= -text translate_*.txt filter= diff= merge= -text