diff options
Diffstat (limited to 'oxidized.gemspec')
| -rw-r--r-- | oxidized.gemspec | 4 |
1 files changed, 0 insertions, 4 deletions
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' ] |