fix bug

src/pages/User/ManagePage_OrgPublic/index.js

@@ -1,28 +1,17 @@
 // material-ui
 import { FiDataGrid } from "components/FiDataGrid";
-
 import {
-<<<<<<< HEAD
-    Typography, Button, Grid, Stack, useMediaQuery
-=======
-    Typography, Button, Grid, Stack,
+    Typography, Button, Grid, Stack, useMediaQuery,
     Dialog, DialogTitle, DialogContent, DialogActions,
->>>>>>> 92d5fde (update primary user setting UI)
 } from '@mui/material';
-
 import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
 import Checkbox from '@mui/material/Checkbox';
-
 import * as React from "react";
 import * as HttpUtils from "utils/HttpUtils";
 import * as UrlUtils from "utils/ApiPathConst";
 import * as DateUtils from "utils/DateUtils";
-<<<<<<< HEAD
 import {FormattedMessage, useIntl} from "react-intl";
 import {useTheme} from "@emotion/react";
-=======
-import { FormattedMessage, useIntl } from "react-intl";
->>>>>>> 92d5fde (update primary user setting UI)
 
 const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
@@ -41,15 +30,12 @@ const BackgroundHead = {
 const ManageOrgUserPage = () => {
     const [rows, setRows] = React.useState([]);
     const intl = useIntl();
-<<<<<<< HEAD
     const theme = useTheme();
     const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
-=======
     const [userId, setUserId] = React.useState("");
     const [isWarningPopUp, setIsWarningPopUp] = React.useState(false);
     const [warningText, setWarningText] = React.useState("");
     const [selectUser, setSelectUser] = React.useState({});
->>>>>>> 92d5fde (update primary user setting UI)
 
     const _sx = {
         padding: "4 2 4 2",
@@ -194,14 +180,9 @@ const ManageOrgUserPage = () => {
         {
             field: 'actions',
             type: 'actions',
-<<<<<<< HEAD
             headerName: getHeader(intl.formatMessage({id: 'status'})),
             width: isMdOrLg ? 'auto' : 160,
             flex: isMdOrLg ? 1 : undefined,
-=======
-            headerName: getHeader(intl.formatMessage({ id: 'status' })),
-            flex: 1,
->>>>>>> 92d5fde (update primary user setting UI)
             cellClassName: 'actions',
             getActions: (params) => {
                 return [getStatus(params)]