From a7b131ddc0c246ffaef8c01c4425c8b0c35417c8 Mon Sep 17 00:00:00 2001
From: soupette <cyril.lpz@gmail.com>
Date: Thu, 6 May 2021 13:37:16 +0200
Subject: [PATCH] Fix conflicts

Signed-off-by: soupette <cyril.lpz@gmail.com>
---
 .../admin/admin/src/components/AutoReloadOverlayBlocker/Icon.js | 1 -
 packages/core/admin/admin/src/tests/StrapiApp.test.js           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/core/admin/admin/src/components/AutoReloadOverlayBlocker/Icon.js b/packages/core/admin/admin/src/components/AutoReloadOverlayBlocker/Icon.js
index 0e326be5c0..74a7ff550c 100644
--- a/packages/core/admin/admin/src/components/AutoReloadOverlayBlocker/Icon.js
+++ b/packages/core/admin/admin/src/components/AutoReloadOverlayBlocker/Icon.js
@@ -5,7 +5,6 @@ import PropTypes from 'prop-types';
 const Icon = ({ elapsed, icon }) => {
   let displayedIcon = icon;
   let className = 'icoContainer spinner';
-  console.log({ icon });
 
   if (elapsed > 15) {
     displayedIcon = ['far', 'clock'];
diff --git a/packages/core/admin/admin/src/tests/StrapiApp.test.js b/packages/core/admin/admin/src/tests/StrapiApp.test.js
index 927e68bf6d..4fbd691722 100644
--- a/packages/core/admin/admin/src/tests/StrapiApp.test.js
+++ b/packages/core/admin/admin/src/tests/StrapiApp.test.js
@@ -72,7 +72,7 @@ describe('ADMIN | StrapiApp', () => {
         </body>,
         "container": <div>
           <div
-            class="sc-bjeSvz VelTJ"
+            class="sc-hgKjYe bLgkBB"
           />
           <div
             class="Loader-sc-1xt0x01-0 JXMaR"