diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2017-07-18 13:42:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 13:42:57 -0400 |
| commit | 36ff7b63ec083924a5b407cf3df7ae90e22183e2 (patch) | |
| tree | 8cbdbe138f13a0dc7c3666f036fda685c644d262 /activesupport/test/multibyte_normalization_conformance_test.rb | |
| parent | 425ba83c28214ca97c5d3600c16ad7a796cd33e6 (diff) | |
| parent | f47bac481949a69a519ea7d833e1a8d435332d52 (diff) | |
| download | rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.tar.gz rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.tar.bz2 rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.zip | |
Merge branch 'master' into fix_unscope_where_column_with_or
Diffstat (limited to 'activesupport/test/multibyte_normalization_conformance_test.rb')
| -rw-r--r-- | activesupport/test/multibyte_normalization_conformance_test.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/test/multibyte_normalization_conformance_test.rb b/activesupport/test/multibyte_normalization_conformance_test.rb index deb94a7aa3..1173a94e81 100644 --- a/activesupport/test/multibyte_normalization_conformance_test.rb +++ b/activesupport/test/multibyte_normalization_conformance_test.rb @@ -1,4 +1,3 @@ -# encoding: utf-8 # frozen_string_literal: true require "abstract_unit" |