From a4e76983e3550ba28783401276cb87b817a0240a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Thu, 7 Jan 2016 10:45:15 +0100
Subject: [PATCH] .gitattributes: Set merge union merge driver for
 common/shlibs

This will reduce merge conflicts for common/shlibs.
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index e1afc94d5da..7f24a8f81d0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 template linguist-language=bash
+common/shlibs merge=union