error

2025-07-04 15:59:14 +05:00 · 2025-07-04 15:59:14 +05:00 · b997f554bc
commit b997f554bc
parent ca33a55375 26a364aad6
1 changed files with 3 additions and 0 deletions
--- a/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx
+++ b/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx
@ -2,7 +2,10 @@ import React from 'react';
 import styled from 'styled-components';
 import {DeviceUser} from "../../../../../../store/useDeviceStore";
 import {TableScanner} from "./TableScanner";
+<<<<<<< HEAD

+=======
+>>>>>>> 26a364aad6dc04d237ff4756cd322508cdffb2b1

 const ScanBtn = styled.button`
    position: relative;