summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 7282c9e61b1..0b87a97df9c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
+VERSION merge=ours
Dangerfile gitlab-language=ruby
db/schema.rb merge=merge_db_schema