aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-09-05 09:06:55 +0000
committerJamis Buck <jamis@37signals.com>2005-09-05 09:06:55 +0000
commit873be1258e5150a5e0decaf76cfa0c04c01ba54c (patch)
treea9442e3e6cdd1813250b786e2478d8b713a1db8a /actionmailer/lib/action_mailer
parent258bacbf8221dc20a83cfaa03decfb522bda3ffb (diff)
downloadrails-873be1258e5150a5e0decaf76cfa0c04c01ba54c.tar.gz
rails-873be1258e5150a5e0decaf76cfa0c04c01ba54c.tar.bz2
rails-873be1258e5150a5e0decaf76cfa0c04c01ba54c.zip
Fix vendor require paths to prevent files being required twice
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2130 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer')
-rw-r--r--actionmailer/lib/action_mailer/mail_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index 0235fcdc61..9c7370065f 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -1,4 +1,4 @@
-require 'action_mailer/vendor/text/format'
+require 'text/format'
module MailHelper#:nodoc:
def block_format(text)
@@ -14,4 +14,4 @@ module MailHelper#:nodoc:
formatted
end
-end \ No newline at end of file
+end