diff options
| author | Michael Koziarski <michael@koziarski.com> | 2009-09-04 14:28:32 +1200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2009-09-04 14:28:32 +1200 |
| commit | 87c93da440b099856fe3437c5bb269f01fb95379 (patch) | |
| tree | 63c3f7806443a540358e5d4df8ee814ce22bb100 /activesupport | |
| parent | b16e0c922344da256ab977fd5e7a7f69e0be90fc (diff) | |
| download | rails-87c93da440b099856fe3437c5bb269f01fb95379.tar.gz rails-87c93da440b099856fe3437c5bb269f01fb95379.tar.bz2 rails-87c93da440b099856fe3437c5bb269f01fb95379.zip | |
Fix a messed up merge commit
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/multibyte.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/multibyte.rb b/activesupport/lib/active_support/multibyte.rb index f59285daba..6f2016a409 100644 --- a/activesupport/lib/active_support/multibyte.rb +++ b/activesupport/lib/active_support/multibyte.rb @@ -1,9 +1,5 @@ # encoding: utf-8 -require 'active_support/multibyte/chars' -require 'active_support/multibyte/exceptions' -require 'active_support/multibyte/unicode_database' - require 'active_support/core_ext/module/attribute_accessors' module ActiveSupport #:nodoc: |