psimsa/handlebars.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge error

Browse Source
This commit is contained in:
kpdecker
2013-06-02 00:37:18 -05:00
parent 9a334400f0
commit 5ce7232dc3
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+3
View File
@@ -1,4 +1,7 @@
source "http://rubygems.org" source "http://rubygems.org"
gem "rake" gem "rake"
gem "json"
gem "nokogiri"
gem "aws-sdk" gem "aws-sdk"
gem "uuidtools"
Gemfile.lock
+6
View File
@@ -5,11 +5,17 @@ GEM
json (~> 1.4) json (~> 1.4)
nokogiri (>= 1.4.4) nokogiri (>= 1.4.4)
uuidtools (~> 2.1) uuidtools (~> 2.1)
json (1.8.0)
nokogiri (1.5.9)
rake (10.0.3) rake (10.0.3)
uuidtools (2.1.4)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
aws-sdk aws-sdk
json
nokogiri
rake rake
uuidtools