From c6595053688d812dd8451570059a1fae0075cbe0 Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Sat, 21 May 2011 01:23:17 -0400
Subject: [PATCH] fixed some ruby 19 warnings, including circular requires and
 variable name reuse

---
 actionpack/lib/action_view/helpers/asset_paths.rb   | 1 -
 actionpack/lib/action_view/template/handlers/erb.rb | 1 -
 2 files changed, 2 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb
index 958f0e0a10..38810eea2e 100644
--- a/actionpack/lib/action_view/helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_paths.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/file'
-require 'action_view/helpers/asset_paths'
 
 module ActionView
   module Helpers
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 7e9e4e518a..a1e3fd7768 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/class/attribute_accessors'
-require 'action_view/template'
 require 'action_view/template/handler'
 require 'erubis'