diff --git a/Rails.gitattributes b/Rails.gitattributes index 8514c9e..d59949d 100644 --- a/Rails.gitattributes +++ b/Rails.gitattributes @@ -4,4 +4,4 @@ # Define a dummy ours merge strategy with: # # $ git config --global merge.ours.driver true -schema.rb merge=ours +schema.rb merge=ours diff=ruby