Solving merge conflicts.

2 files changed, 5 insertions, 5 deletions

diff --git a/actionpack/lib/action_view/template/renderable.rb b/actionpack/lib/action_view/template/renderable.rb
index 54857516ab..7687578165 100644
--- a/actionpack/lib/action_view/template/renderable.rb
+++ b/actionpack/lib/action_view/template/renderable.rb
@@ -12,9 +12,9 @@ module ActionView
     end
     
     def load!
-      names = Base::CompiledTemplates.instance_methods.grep(/#{method_name_without_locals}/)
+      names = CompiledTemplates.instance_methods.grep(/#{method_name_without_locals}/)
       names.each do |name|
-        Base::CompiledTemplates.class_eval do
+        CompiledTemplates.class_eval do
           remove_method(name)
         end
       end
@@ -56,7 +56,7 @@ module ActionView
     def compile(local_assigns)
       render_symbol = method_name(local_assigns)
 
-      if !Base::CompiledTemplates.method_defined?(render_symbol) || recompile?
+      if !CompiledTemplates.method_defined?(render_symbol) || recompile?
         compile!(render_symbol, local_assigns)
       end
     end
@@ -74,7 +74,7 @@ module ActionView
         end_src
 
         begin
-          ActionView::Base::CompiledTemplates.module_eval(source, filename.to_s, 0)
+          ActionView::CompiledTemplates.module_eval(source, filename.to_s, 0)
         rescue Exception => e # errors from template code
           if logger = defined?(ActionController) && Base.logger
             logger.debug "ERROR: compiling #{render_symbol} RAISED #{e}"
diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template/template.rb
index fac50cd692..4145045e2d 100644
--- a/actionpack/lib/action_view/template/template.rb
+++ b/actionpack/lib/action_view/template/template.rb
@@ -75,7 +75,7 @@ module ActionView
       end
 
       begin
-        ActionView::Base::CompiledTemplates.module_eval(source, identifier, line)
+        ActionView::CompiledTemplates.module_eval(source, identifier, line)
         method_name
       rescue Exception => e # errors from template code
         if logger = (view && view.logger)