From b3de13d6722c152854996321c120a6b1f3f8a59f Mon Sep 17 00:00:00 2001
From: Torsten <torsten@villataika.fi>
Date: Fri, 20 Oct 2023 21:36:23 +0300
Subject: [PATCH] update merged

---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 33642fd..2005e96 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"