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

Fix conflicts

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2021-05-06 13:37:16 +02:00
parent 62c7dadc3d
commit a7b131ddc0
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/admin/admin/src/components/AutoReloadOverlayBlocker/Icon.js
View File

@ -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'];

2
packages/core/admin/admin/src/tests/StrapiApp.test.js
View File

@ -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"