From 2a465cc6872984865381c7c19165e44cba6d5399 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Mon, 16 Mar 2020 10:02:49 -0700
Subject: [PATCH] Use merge=union driver for go.sum

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

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