aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
blob: d4ff363292f375ffe8e768fd6e71fd190c83305a (plain) (blame)
1
CHANGES.txt merge=union