Fix non-conflicting merge failure from prior merge

funny-falcon · Nov 3, 2012 · 63b5adf · 63b5adf
1 parent 75b358c
commit 63b5adf
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/lib/rack/session/abstract/id.rb b/lib/rack/session/abstract/id.rb
@@ -117,11 +117,6 @@ def empty?
           @data.empty?
         end
 
-        def merge!(hash)
-          load_for_write!
-          super(stringify_keys(hash))
-        end
-
       private
 
         def load_for_read!