From fb5f40319ee9b7896abc6fb91b39403645ef8ce3 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 1 Jun 2016 15:10:57 +0100
Subject: [PATCH] update gitattributes for easier fork mngmnt

---
 .gitattributes | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 80edb3f0c..276cc7709 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,4 @@
 CHANGELOG.md merge=union
-
+README.md merge=union
+plugins/inputs/all/all.go merge=union
+plugins/outputs/all/all.go merge=union