fix everything

This commit is contained in:
David Ralph
2020-10-04 17:21:15 +01:00
parent 1cdb469d08
commit d2ce84cac4
5 changed files with 15 additions and 25 deletions

View File

@@ -13,7 +13,7 @@ import Navbar from './components/Navbar';
import SettingsFunctions from './modules/settingsFunctions';
import { ToastContainer } from 'react-toastify';
import Modal from 'react-modal';
import { merge } from './modules/merge';
import merge from 'lodash.merge';
import RoomIcon from '@material-ui/icons/Room';
// Modals are lazy loaded as a user won't use them every time they open a tab