From: Neil Smith <neil.github@njae.me.uk>
Date: Mon, 5 Mar 2012 21:50:15 +0000 (+0000)
Subject: Resolved merge issues
X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;h=804c1d3850e599aea8cb3258d1a875be148a3b30;p=graph.njae.git

Resolved merge issues
---

804c1d3850e599aea8cb3258d1a875be148a3b30
diff --cc Gemfile
index f677f3d,e295851..804c2dc
--- a/Gemfile
+++ b/Gemfile
@@@ -6,8 -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"
 -  gem "rdoc"
  end