123

1 year ago · 892c22aada
parent 16bd6aa813
commit 892c22aada
1 changed files with 0 additions and 6 deletions
--- a/src/App.js
+++ b/src/App.js
@ -87,11 +87,6 @@ const App = () => {
            <Th>ФИО</Th>
            <Th>Лаборатория</Th>
            <Th>Время входа</Th>
-<<<<<<< HEAD
-			//<Th>ОФис</Th>
-=======
-		//	<Th>ОФис</Th>
->>>>>>> c743b02ee90be2ef71c4af586bb58ae406edc98f
          </tr>
        </thead>
        <tbody>
@ -102,7 +97,6 @@ const App = () => {
              <Td>{item.name}</Td>
              <Td>{item.lab}</Td>
              <Td>{item.timeIn}</Td>
-            //  <Td>{item.officeName}</Td>
            </Tr>
          ))}
        </tbody>