From a01dda2eed22a4fa736dcfeed1a7579d66d02ccb Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Thu, 19 Jan 2017 12:44:37 +0100
Subject: [PATCH] Remove custom merge strategy for changelog

This causes old PRs to add the changelog entry to already released
versions. It happened to me while rebasing #207
---
 .gitattributes | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 6f9ff673..00000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-CHANGES.rst merge=union