Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix non-conflicting merge failure from prior merge

  • Loading branch information...
commit 63b5adf0d95e6d3f0f549ec87e9afbc21e934d3c 1 parent 75b358c
@raggi raggi authored
Showing with 0 additions and 5 deletions.
  1. +0 −5 lib/rack/session/abstract/id.rb
View
5 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!
Please sign in to comment.
Something went wrong with that request. Please try again.