From 97c49d6298e2bd6edd98d44895fc16c9bde99ca8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 22 Aug 2016 23:54:11 -0400
Subject: [PATCH] update changelog location

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

diff --git a/.gitattributes b/.gitattributes
index 5d425843f2..a81b30b931 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-debian/changelog merge=dpkg-mergechangelogs
+CHANGELOG merge=dpkg-mergechangelogs