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