diff options
| author | kpdecker <kpdecker@gmail.com> | 2013-06-02 00:37:18 -0500 |
|---|---|---|
| committer | kpdecker <kpdecker@gmail.com> | 2013-06-02 00:37:18 -0500 |
| commit | 5ce7232dc34f338d252ef0795f95dbb13b6bb6cf (patch) | |
| tree | a30ee616df359c3336915a46b95b016c53bdb264 | |
| parent | 9a334400f06bf2add7460ef615c015ee1afc0748 (diff) | |
| download | handlebars.js-5ce7232dc34f338d252ef0795f95dbb13b6bb6cf.zip handlebars.js-5ce7232dc34f338d252ef0795f95dbb13b6bb6cf.tar.gz handlebars.js-5ce7232dc34f338d252ef0795f95dbb13b6bb6cf.tar.bz2 | |
Fix merge error
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 9 insertions, 0 deletions
@@ -1,4 +1,7 @@ source "http://rubygems.org" gem "rake" +gem "json" +gem "nokogiri" gem "aws-sdk" +gem "uuidtools" diff --git a/Gemfile.lock b/Gemfile.lock index 31523df..1a8fc13 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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 |