From ed20dfc4da65226363606da8bed1d95568079ee3 Mon Sep 17 00:00:00 2001
From: Miles Macklin <mmacklin@nvidia.com>
Date: Tue, 2 Jul 2024 19:14:17 -0700
Subject: [PATCH] Update .gitattributes to avoid CHANGELOG.md conflicts

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index c3c47756..b003cbb6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -17,3 +17,5 @@
 # Exclude vendored code from project language stats
 warp/native/cutlass/** linguist-vendored
 tools/** linguist-vendored
+
+CHANGELOG.md merge=union
\ No newline at end of file