ReC98/.gitattributes
nmlgc b2184e99fd [Maintenance] Remove merge=union from .gitattributes
What the…? *That's* what's been messing up merge conflicts all the
time?

Part of P0032, funded by zorg.
2019-09-21 13:03:17 +02:00

3 lines
44 B
Plaintext

*.asm text eol=crlf
zuncom/zun*.txt -text