From 2d5c8273edd171a70bd437a63bee27b768cb39e6 Mon Sep 17 00:00:00 2001
From: mraniki <8766259+mraniki@users.noreply.github.com>
Date: Tue, 9 Jul 2024 12:54:57 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20=F0=9F=9A=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 findmyorder/config.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/findmyorder/config.py b/findmyorder/config.py
index 0ce9e616..8117b3a1 100644
--- a/findmyorder/config.py
+++ b/findmyorder/config.py
@@ -1,6 +1,7 @@
 """
  FindMyOrder Config
 """
+
 import os
 
 from dynaconf import Dynaconf
@@ -18,10 +19,13 @@
         os.path.join(ROOT, "default_settings.toml"),
         "talky_settings.toml",
         "settings.toml",
-        ".secrets.toml" ".op.toml",
+        ".secrets.toml",
+        ".op.toml",
     ],
     # Load the.env file
     load_dotenv=True,
+    # merge=True,
+    merge_enabled=True,
     # Set the environments to True
     environments=True,
     # Set the default environment