From 59189438388191c044c0697d5bfb571693d95978 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 15 Nov 2016 17:04:33 +0200
Subject: [PATCH] Remove gitattribute entry for CHANGELOG.md

[ci skip]
---
 .gitattributes | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index ab791a4cd6c..70cce05d2b5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
-CHANGELOG.md merge=union
 *.js.es6 gitlab-language=javascript