diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-31 01:15:30 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-31 01:15:30 -0500 |
| commit | 96c27e4003b803b9ac1a3581dfe1c181ba79556a (patch) | |
| tree | 24a6c8573dfe3aa01abd4464eafbeb86e96cd250 /railties/lib/rails/core.rb | |
| parent | 5d8342cc325bc9f46bfe61bf3534248b6ad3216f (diff) | |
| parent | c4c2502df8b0b7b5fa28d796bdb1d4bd02af4b3d (diff) | |
| download | rails-96c27e4003b803b9ac1a3581dfe1c181ba79556a.tar.gz rails-96c27e4003b803b9ac1a3581dfe1c181ba79556a.tar.bz2 rails-96c27e4003b803b9ac1a3581dfe1c181ba79556a.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/lib/rails/core.rb')
| -rw-r--r-- | railties/lib/rails/core.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/core.rb b/railties/lib/rails/core.rb index c819e90dd7..ab95edc676 100644 --- a/railties/lib/rails/core.rb +++ b/railties/lib/rails/core.rb @@ -12,7 +12,6 @@ require 'rails/railties_path' require 'rails/version' require 'rails/rack' require 'rails/paths' -require 'rails/core' require 'rails/configuration' require 'rails/deprecation' require 'rails/ruby_version_check' @@ -103,4 +102,4 @@ module Rails @@public_path = path end end -end
\ No newline at end of file +end |