From 4f0fb3d105d9fd18f211425829076cad0dde5a1c Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Thu, 19 Jan 2023 00:13:11 +0200
Subject: [PATCH] update merged

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

diff --git a/Gemfile b/Gemfile
index c63c6b2..a6c3ffd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,8 +2,8 @@ source "https://rubygems.org"
 
 ruby "3.1.3"
 
-#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 "rails", "~> 7.0"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b825c53..8197ece 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: 6a8dc3f8c6bf28549e80b9a2d8e4e218b0bdf001
   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: