From ebffbeafa6e06bf38b64bcf5ded66d64d045da39 Mon Sep 17 00:00:00 2001
From: Rob Gonzalez-Pita <rob.g.pita@noaa.gov>
Date: Fri, 15 Dec 2023 11:22:16 -0700
Subject: [PATCH] Update .gitattributes

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 6033e76e7..76ebc9c6c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 # Set the default behavior for end of lines.
 * text eol=lf
+docs/CHANGELOG.md merge=union