summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 8383fff94e23ce76f21c7b3d9a1b4ae01f1834ca (plain)
1
CHANGES merge=union