summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 9122eeb17b1e5ae3088868d42af6619a20085391 (plain)
1
2
BUILD_NUMBER	merge=merge-keep-ours