teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11ec131d3a
vp-build/.gitattributes

3 lines
58 B
Plaintext
Raw Normal View History

add .gitattributes, hoping to fix GitHub language stats.
2015-03-20 20:46:36 +01:00
template linguist-language=bash
.gitattributes: Set merge union merge driver for common/shlibs This will reduce merge conflicts for common/shlibs.
2016-01-07 10:45:15 +01:00
common/shlibs merge=union
Reference in New Issue Copy Permalink