switched back to git merged
This commit is contained in:
parent
f0ad59e47c
commit
1f5f52bd52
4
Gemfile
4
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"
|
||||
|
@ -1,5 +1,6 @@
|
||||
PATH
|
||||
remote: ../merged
|
||||
GIT
|
||||
remote: https://github.com/FeenixMakers/merged
|
||||
revision: fc79c65b54a7703d162a97fb15a25de3c572c2a9
|
||||
specs:
|
||||
merged (0.1.0)
|
||||
active_hash
|
||||
|
Loading…
Reference in New Issue
Block a user