diff --git a/Gemfile b/Gemfile index d07bcc5..4cccf15 100644 --- a/Gemfile +++ b/Gemfile @@ -19,8 +19,8 @@ gem "sassc-rails" gem "haml-rails", "~> 2.0" gem 'html2haml' -#gem "merged" , git: "https://github.com/FeenixMakers/merged" -gem "merged" , path: "../merged" +gem "merged" , git: "https://github.com/FeenixMakers/merged" +#gem "merged" , path: "../merged" # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images] # gem "image_processing", "~> 1.2" diff --git a/Gemfile.lock b/Gemfile.lock index 5252fde..a4aabed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,6 @@ -PATH - remote: ../merged +GIT + remote: https://github.com/FeenixMakers/merged + revision: fc79c65b54a7703d162a97fb15a25de3c572c2a9 specs: merged (0.1.0) active_hash