From e36719c4f657e790d78456d1b6ea91c6fe820307 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Sun, 8 Jan 2023 23:51:34 +0200
Subject: [PATCH] leave merged local for now

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

diff --git a/Gemfile b/Gemfile
index 701ac53..fe5a670 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,8 +22,8 @@ gem 'thredded', '~> 1.0'
 gem "simple_form" , "5.1.0"
 gem "simple_form_tailwind_css"
 
-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 23ca743..1eaadc6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,14 @@
 GIT
-  remote: https://github.com/HubFeenixMakers/merged
-  revision: 178c0ba9d207acac46d799379926bf44307545f9
+  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
   specs:
     merged (0.1.0)
       active_hash
@@ -11,15 +19,6 @@ GIT
       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: