wycats / merb-more fork watch download tarball
public
Description: Merb More: The Full Stack. Take what you need; leave what you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-more.git
Search Repo: 
Resolved conflict in merb-cache.
Michael S. Klishin (author)
Mon Jul 21 16:30:36 -0700 2008
commit  32fa551ba42d99f8bd1effdc3b5a2f8621dd0e19
tree    dbd852341b67e1618d3ed4b9257b24489f609210
parent  3d9f1c981bf28d423ccc4a93443cd1eed19d97ff
0
merb-cache/lib/merb-cache/cache-action.rb 
...
28
29
30
31
32
33
34
35
36
37
38
39
40
...
43
44
45
46
47
48
49
 
...
28
29
30
 
 
 
 
 
 
 
31
32
33
...
36
37
38
 
39
40
41
 
0
@@ -28,13 +28,6 @@ module Merb::Cache::ControllerClassMethods
0
   # ==== Example
0
   #   cache_actions :mostly_static, [:barely_dynamic, 10]
0
   def cache_actions(*actions)
0
-<<<<<<< HEAD:merb-cache/lib/merb-cache/cache-action.rb
0
-    if actions.any? && !Merb::Cache.cached_actions.key?(controller_name)
0
-      before(:cache_action_before)
0
-      after(:cache_action_after)
0
-    end
0
-    actions.each do |action, from_now| 
0
-=======
0
     actions.each do |action, from_now, opts|
0
       from_now, opts = nil, from_now if Hash === from_now
0
       
0
@@ -43,7 +36,6 @@ module Merb::Cache::ControllerClassMethods
0
       alias_method "cache_#{action}_before", :cache_action_before
0
       alias_method "cache_#{action}_after", :cache_action_after
0
       
0
->>>>>>> new_merb_gen:merb-cache/lib/merb-cache/cache-action.rb
0
       _actions = Merb::Cache.cached_actions[controller_name] ||= {}
0
       _actions[action] = from_now
0
     end

Comments

    No one has commented yet.