dist/ merge=ours
application/language/**/*.php merge=ours
text=auto
