summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 0b87a97df9c80f92bf3f332bbb302a404ae1534a (plain)
1
2
3
VERSION merge=ours
Dangerfile gitlab-language=ruby
db/schema.rb merge=merge_db_schema