divining_rod 0.6.1 → 0.6.2

data/lib/divining_rod/mash.rb

@@ -6,6 +6,7 @@ module DiviningRod
     end
 
     def merge(opts = {})
+      return self if opts.nil?
       if self[:tags] || opts[:tags]
         tags = Array(self[:tags]) | Array(opts[:tags])
         opts[:tags] = tags

data/lib/divining_rod/version.rb

@@ -1,3 +1,3 @@
 module DiviningRod
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: divining_rod
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Mark Percival