From 43dd9376b992274957e3ce041c34d78f7eb2e97f Mon Sep 17 00:00:00 2001
From: soupette <cyril.lpz@gmail.com>
Date: Tue, 18 May 2021 08:52:58 +0200
Subject: [PATCH] Fix conflcits

Signed-off-by: soupette <cyril.lpz@gmail.com>
---
 .../admin/src/containers/DataManagerProvider/index.js        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/core/content-type-builder/admin/src/containers/DataManagerProvider/index.js b/packages/core/content-type-builder/admin/src/containers/DataManagerProvider/index.js
index c5d33322f4..f41aff5870 100644
--- a/packages/core/content-type-builder/admin/src/containers/DataManagerProvider/index.js
+++ b/packages/core/content-type-builder/admin/src/containers/DataManagerProvider/index.js
@@ -66,11 +66,8 @@ const DataManagerProvider = ({
 }) => {
   const dispatch = useDispatch();
   const toggleNotification = useNotification();
-<<<<<<< HEAD
-=======
-  const toggleNotificationRef = useRef(toggleNotification);
+
   const { lockAppWithAutoreload, unlockAppWithAutoreload } = useAutoReloadOverlayBlocker();
->>>>>>> 5b870248a (Remove strapi.lockApp)
 
   const { getPlugin } = useStrapiApp();