From 1ee130b83a28f822cdc3379c24d4965ceee86034 Mon Sep 17 00:00:00 2001
From: Elvin Efendi <elvin.efendiyev@gmail.com>
Date: Mon, 4 Jan 2016 10:24:46 -0500
Subject: merge version

---
 oxidized.gemspec | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'oxidized.gemspec')

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' ]
-- 
cgit v1.2.1