Add merge function from @eartharoid

Co-authored-by: Isaac Saunders <contact@eartharoid.me>
This commit is contained in:
David Ralph
2021-02-28 12:51:26 +00:00
parent d42f69ae95
commit 5836849ab9
3 changed files with 21 additions and 3 deletions

View File

@@ -8,7 +8,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 'deepmerge';
import merge from './modules/helpers/merge';
// 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'));