Resolved merge issues

[graph.njae.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 8c9be56242166e3f0419405d7dc0718ffbc25cae..0679be6f5907889a0014c5be8f6089531d8697bc 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,10 +3,11 @@ GEM
   specs:
     diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.6.4)
+    jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
     json (1.6.5)
     rake (0.9.2.2)
     rdoc (3.12)