From d80e9d09c8e5a0a5d92501a954e0d77813d62c56 Mon Sep 17 00:00:00 2001
From: David Ralph <davetheprogrammer2@gmail.com>
Date: Mon, 30 Nov 2020 22:25:56 +0000
Subject: [PATCH] replace lodash.merge with deepmerge

---
 package.json | 2 +-
 src/App.jsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c75c9060..2b1e6bef 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,9 @@
     "@material-ui/core": "4.11.1",
     "@material-ui/icons": "4.9.1",
     "@muetab/quotes": "^1.0.0",
+    "deepmerge": "^4.2.2",
     "fontsource-lexend-deca": "^3.0.10",
     "fontsource-roboto": "^3.0.3",
-    "lodash.merge": "4.6.2",
     "react": "17.0.1",
     "react-clock": "^2.4.0",
     "react-color-gradient-picker": "^0.1.2",
diff --git a/src/App.jsx b/src/App.jsx
index 1ca8704a..35dd7854 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -15,7 +15,7 @@ import Navbar from './components/widgets/navbar/Navbar';
 import SettingsFunctions from './modules/helpers/settings';
 import { ToastContainer } from 'react-toastify';
 import Modal from 'react-modal';
-import merge from 'lodash.merge';
+import merge from 'deepmerge';
 
 // Modals are lazy loaded as the user won't use them every time they open a tab
 const Main = React.lazy(() => import('./components/modals/Main'));