Skip to content

Commit b304b6d

Browse files
committed
Fix conflict in marketplace card
1 parent ef2fc5c commit b304b6d

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

app/src/components/marketplace/MarketplaceCard.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
Typography,
1313
styled
1414
} from '@mui/material';
15+
import MuiAlert, { AlertProps } from '@mui/material/Alert';
1516
import React, { useEffect } from 'react';
1617
import {
1718
openProject,
@@ -21,14 +22,12 @@ import { useDispatch, useSelector } from 'react-redux';
2122

2223
import { MoreVert } from '@mui/icons-material';
2324
import { RootState } from '../../redux/store';
25+
import Snackbar from '@mui/material/Snackbar';
2426
import axios from 'axios';
2527
import imageSrc from '../../../../resources/marketplace_images/marketplace_image.png';
2628
import { red } from '@mui/material/colors';
2729
import { saveProject } from '../../helperFunctions/projectGetSaveDel';
2830
import { useHistory } from 'react-router-dom';
29-
import { openProject } from '../../redux/reducers/slice/appStateSlice';
30-
import MuiAlert, { AlertProps } from '@mui/material/Alert';
31-
import Snackbar from '@mui/material/Snackbar';
3231

3332
interface Project {
3433
forked: String;

0 commit comments

Comments
 (0)