From 9a8ede22106c3f59d014be4905a078711180d30c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 29 Jun 2016 17:28:49 -0700
Subject: Fix gitattributes

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

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 7e800609..a19ade07 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-CHANGELOG merge=union
\ No newline at end of file
+CHANGELOG.md merge=union
-- 
cgit