aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
blob: 7e800609e6c76c14893419965f1ce0ba400d9ace (plain) (blame)
1
CHANGELOG merge=union