4
Fork 0

Merge branch 'merging' into development

# Conflicts:
#	.gitattributes
english-generic-dialogue
Eddoursul 2 years ago
parent a5504bfaa6
commit 876cc15a9b
  1. 1
      .gitattributes

1
.gitattributes vendored

@ -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

Loading…
Cancel
Save