From fb9be2fe7ac0238f817f04bf8aa87b0ba6907ff7 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Mon, 16 Jan 2023 22:30:12 +0200
Subject: [PATCH] git merged

---
 Gemfile      |  4 ++--
 Gemfile.lock | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 02197e5..39d4f08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,8 +23,8 @@ gem "simple_form" , "5.1.0"
 gem "simple_form_tailwind_css"
 gem 'kaminari'
 
-#gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
-gem "merged" , path: "../merged"
+gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
+#gem "merged" , path: "../merged"
 
 gem "passenger" ,  require: "phusion_passenger/rack_handler"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a66048e..60c9cf1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,6 @@
 GIT
-  remote: https://github.com/ruby2js/ruby2js/
-  revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d
-  branch: haml_fix
-  specs:
-    ruby2js (5.0.1)
-      parser
-      regexp_parser (~> 2.1.1)
-
-PATH
-  remote: ../merged
+  remote: https://github.com/HubFeenixMakers/merged
+  revision: c58b5fc4ba4ef138dcf7dd50592bdebac378cbda
   specs:
     merged (0.1.0)
       active_hash
@@ -19,6 +11,15 @@ PATH
       redcarpet
       ruby2js (~> 5.0, >= 5.0.1)
 
+GIT
+  remote: https://github.com/ruby2js/ruby2js/
+  revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d
+  branch: haml_fix
+  specs:
+    ruby2js (5.0.1)
+      parser
+      regexp_parser (~> 2.1.1)
+
 GEM
   remote: https://rubygems.org/
   specs: