aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
blob: a7761ba96b7f79898b1b1ca54fc43e85644b5190 (plain)
1
/CHANGES merge=union