Remove custom merge strategy for db/schema.rb

c948540c · Andreas Brandl · 18049a7c · c948540c
Commit c948540c authored Oct 10, 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