summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: fdf9d072f708932ec339be507e059c50d7d92d99 (plain)
1
2
.build_number	merge=merge-keep-ours