Fix merge error

2013-06-02 00:37:18 -05:00
parent 9a334400f0
commit 5ce7232dc3
2 changed files with 9 additions and 0 deletions
@@ -1,4 +1,7 @@
 source "http://rubygems.org"

 gem "rake"
+gem "json"
+gem "nokogiri"
 gem "aws-sdk"
+gem "uuidtools"
@@ -5,11 +5,17 @@ GEM
      json (~> 1.4)
      nokogiri (>= 1.4.4)
      uuidtools (~> 2.1)
+    json (1.8.0)
+    nokogiri (1.5.9)
    rake (10.0.3)
+    uuidtools (2.1.4)

 PLATFORMS
  ruby

 DEPENDENCIES
  aws-sdk
+  json
+  nokogiri
  rake
+  uuidtools