123

.drone.yml

@@ -49,8 +49,3 @@ steps:
     ```
     🌐 {{ build.link }}
     {{/success}}        
-
-volumes:
-  - name: node-build
-    host:
-      path: /root/docker/gitea/drone/src

src/App.js

@@ -87,7 +87,11 @@ const App = () => {
             <Th>ФИО</Th>
             <Th>Лаборатория</Th>
             <Th>Время входа</Th>
+<<<<<<< HEAD
 			//<Th>ОФис</Th>
+=======
+		//	<Th>ОФис</Th>
+>>>>>>> c743b02ee90be2ef71c4af586bb58ae406edc98f
           </tr>
         </thead>
         <tbody>
@@ -98,7 +102,7 @@ const App = () => {
               <Td>{item.name}</Td>
               <Td>{item.lab}</Td>
               <Td>{item.timeIn}</Td>
-              <Td>{item.officeName}</Td>
+            //  <Td>{item.officeName}</Td>
             </Tr>
           ))}
         </tbody>