yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflcits

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2021-05-18 08:52:58 +02:00
parent 9edacb088a
commit 43dd9376b9
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/content-type-builder/admin/src/containers/DataManagerProvider/index.js
View File

@ -66,11 +66,8 @@ const DataManagerProvider = ({
}) => { }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const toggleNotification = useNotification(); const toggleNotification = useNotification();
<<<<<<< HEAD
=======
const toggleNotificationRef = useRef(toggleNotification);
const { lockAppWithAutoreload, unlockAppWithAutoreload } = useAutoReloadOverlayBlocker(); const { lockAppWithAutoreload, unlockAppWithAutoreload } = useAutoReloadOverlayBlocker();
>>>>>>> 5b870248a (Remove strapi.lockApp)
const { getPlugin } = useStrapiApp(); const { getPlugin } = useStrapiApp();