diff options
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | lib/oxidized/config/core.rb | 2 | ||||
| -rw-r--r-- | oxidized.gemspec | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 883b2a5..ce4c8cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - oxidized (0.0.23) + oxidized (0.0.25) grit haml net-ssh diff --git a/lib/oxidized/config/core.rb b/lib/oxidized/config/core.rb index 9b93d91..ec08dab 100644 --- a/lib/oxidized/config/core.rb +++ b/lib/oxidized/config/core.rb @@ -12,7 +12,7 @@ module Oxidized def load if File.exists? @file cfg = YAML.load_file @file - marshal_load self.to_h.merge(cfg) + marshal_load marshal_dump.merge(cfg) else save end diff --git a/oxidized.gemspec b/oxidized.gemspec index 9cb6ba6..2824969 100644 --- a/oxidized.gemspec +++ b/oxidized.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'oxidized' - s.version = '0.0.24' + s.version = '0.0.25' s.platform = Gem::Platform::RUBY s.authors = [ 'Saku Ytti' ] s.email = %w( saku@ytti.fi ) |