Skip to content
This repository
Browse code

Fix non-conflicting merge failure from prior merge

  • Loading branch information...
commit 63b5adf0d95e6d3f0f549ec87e9afbc21e934d3c 1 parent 75b358c
James Tucker authored November 03, 2012

Showing 1 changed file with 0 additions and 5 deletions. Show diff stats Hide diff stats

  1. 5  lib/rack/session/abstract/id.rb
5  lib/rack/session/abstract/id.rb
@@ -117,11 +117,6 @@ def empty?
117 117
           @data.empty?
118 118
         end
119 119
 
120  
-        def merge!(hash)
121  
-          load_for_write!
122  
-          super(stringify_keys(hash))
123  
-        end
124  
-
125 120
       private
126 121
 
127 122
         def load_for_read!

0 notes on commit 63b5adf

Please sign in to comment.
Something went wrong with that request. Please try again.