[Maintenance] Remove merge=union from .gitattributes

mirror of https://github.com/nmlgc/ReC98.git
What the…? *That's* what's been messing up merge conflicts all the time? Part of P0032, funded by zorg.
2019-09-20 21:38:08 +02:00 · 2019-09-20 21:38:08 +02:00 · b2184e99fd
parent 9f764fa6fb
commit b2184e99fd
1 changed files with 1 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,2 +1,2 @@
-*.asm text merge=union eol=crlf
+*.asm text eol=crlf
 zuncom/zun*.txt -text
`@ -1,2 +1,2 @@`
	`*.asm text merge=union eol=crlf`	`*.asm text eol=crlf`
	`zuncom/zun*.txt -text`	`zuncom/zun*.txt -text`