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