diff options
| author | Elvin Efendi <elvin.efendiyev@gmail.com> | 2016-01-04 10:24:46 -0500 |
|---|---|---|
| committer | Elvin Efendi <elvin.efendiyev@gmail.com> | 2016-01-04 10:24:46 -0500 |
| commit | 1ee130b83a28f822cdc3379c24d4965ceee86034 (patch) | |
| tree | a22484e097d4c48db4a55200e2e0af14ceb39ad8 | |
| parent | db5545d760a5baad052370504dd03585ac6f3215 (diff) | |
merge version
| -rw-r--r-- | lib/oxidized/version.rb | 2 | ||||
| -rw-r--r-- | oxidized.gemspec | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb index c2a0c0e..38772b7 100644 --- a/lib/oxidized/version.rb +++ b/lib/oxidized/version.rb @@ -1,3 +1,3 @@ module Oxidized - VERSION = '0.8.1' + VERSION = '0.9.0' end diff --git a/oxidized.gemspec b/oxidized.gemspec index 127a2de..83e31cd 100644 --- a/oxidized.gemspec +++ b/oxidized.gemspec @@ -5,11 +5,7 @@ require 'oxidized/version' Gem::Specification.new do |s| s.name = 'oxidized' -<<<<<<< HEAD s.version = Oxidized::VERSION -======= - s.version = '0.9.0' ->>>>>>> upstream/master s.licenses = %w( Apache-2.0 ) s.platform = Gem::Platform::RUBY s.authors = [ 'Saku Ytti', 'Samer Abdel-Hafez', 'Anton Aksola' ] |