Resolved merge issues

[graph.njae.git] / Gemfile.lock

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)