From b2184e99fd98994d2c4d2512b49ec70577496d88 Mon Sep 17 00:00:00 2001
From: nmlgc <nmlgc@nmlgc.net>
Date: Fri, 20 Sep 2019 21:38:08 +0200
Subject: [PATCH] [Maintenance] Remove merge=union from .gitattributes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

What the…? *That's* what's been messing up merge conflicts all the
time?

Part of P0032, funded by zorg.
---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 12315957..0b44be32 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-*.asm text merge=union eol=crlf
+*.asm text eol=crlf
 zuncom/zun*.txt -text