diff --git a/Gemfile.lock b/Gemfile.lock index 044178d..70d58ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,6 +4,7 @@ PATH merged (0.1.0) haml-rails rails (>= 7.0.4) + rugged GEM remote: https://rubygems.org/ @@ -180,6 +181,7 @@ GEM io-console (~> 0.5) rexml (3.2.5) rubyzip (2.3.2) + rugged (1.5.0.1) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) diff --git a/merged b/merged index 8ddc7a0..ecaf0eb 160000 --- a/merged +++ b/merged @@ -1 +1 @@ -Subproject commit 8ddc7a01c81b48a7cacdb51956ac6d266b197cc9 +Subproject commit ecaf0eb587cc0c040dbd6c81e33a32867bce46ea