Resolved merge issues

diff --git a/Gemfile b/Gemfile
index f677f3d2db9e7086230d0faa88ab187cbba78e09..804c2dc7fae9bd275dfee8cebaa091bb43faada0 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -6,8 +6,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec"
-  gem "bundler"
-  gem "jeweler"
-  gem "rdoc"
+  gem "rspec", "~> 2.8.0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.6.2"
 end

diff --git a/Gemfile.lock b/Gemfile.lock
index 9b1b95bce3c4f321cef4e1b43dc973e6891a0f5c..0679be6f5907889a0014c5be8f6089531d8697bc 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,7 +25,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
-  jeweler
+  bundler (~> 1.0.0)
+  jeweler (~> 1.6.2)
   rdoc
-  rspec
+  rspec (~> 2.8.0)

diff --git a/VERSION b/VERSION
index 373f8c6f0736a76e3ee364924ec58066832441d9..72f9fa8202040af5f91a57193e1ca2d701430618 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.3
\ No newline at end of file
+0.2.4
\ No newline at end of file

diff --git a/graph.njae.gemspec b/graph.njae.gemspec
index 69b51df891e50d6a84ab9467fd11ec560551b2b7..a51678d9cce4b638244628f1ba37fd484e909e31 100644 (file)
--- a/graph.njae.gemspec
+++ b/graph.njae.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "graph.njae"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Neil Smith"]
-  s.date = "2011-09-26"
+  s.date = "2012-03-05"
   s.description = "A simple graph library"
   s.email = "neil.github@njae.me.uk"
   s.extra_rdoc_files = [
@@ -38,30 +38,27 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/NeilNjae/graph.njae"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.16"
   s.summary = "A simple graph library"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
   end
 end