Merge branch 'ab/db-schema-merge-strategy' into 'master'

Remove custom merge strategy for db/schema.rb See merge request gitlab-org/gitlab!18406

Merge branch 'ab/db-schema-merge-strategy' into 'master'
Remove custom merge strategy for db/schema.rb See merge request gitlab-org/gitlab!18406
8d6485a1 · Andreas Brandl · b5698d89 · c948540c · 8d6485a1
Commit 8d6485a1 authored Oct 16, 2019 by Andreas Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

.gitattributes .gitattributes +0 -1

No files found.
--- a/.gitattributes
+++ b/.gitattributes
 VERSION merge=ours
 Dangerfile gitlab-language=ruby
-db/schema.rb merge=merge_db_schema