Fix

Arquisoft · Apr 27, 2024 · 48e6db1 · 48e6db1
1 parent adf1919
commit 48e6db1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/webapp/src/pages/Ayuda/AyudaEstadisticas.js b/webapp/src/pages/Ayuda/AyudaEstadisticas.js
@@ -1,9 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-<<<<<<< HEAD
-import { Heading, Table, Thead, Tbody, Tr, Th, Td } from '@chakra-ui/react';
-=======
->>>>>>> a8ab90c201bf92f078a3df55ce8bb921238ae03d
+import { Heading} from '@chakra-ui/react';
 import Nav from '../../components/Nav/Nav';
 import Footer from '../../components/Footer/Footer';
 

diff --git a/webapp/src/pages/Ayuda/AyudaJuego.js b/webapp/src/pages/Ayuda/AyudaJuego.js
@@ -1,14 +1,8 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-<<<<<<< HEAD
-import { Heading, Table, Thead, Tbody, Tr, Th, Td } from '@chakra-ui/react';
+import { Heading} from '@chakra-ui/react';
 import Nav from '../../components/Nav/Nav';
 import Footer from '../../components/Footer/Footer';
-=======
-import Nav from '../../components/Nav/Nav';
-import Footer from '../../components/Footer/Footer';
-
->>>>>>> a8ab90c201bf92f078a3df55ce8bb921238ae03d
 const AyudaModosJuego = () => {
 
   const { t } = useTranslation();

diff --git a/webapp/src/pages/Ayuda/AyudaSocial.js b/webapp/src/pages/Ayuda/AyudaSocial.js
@@ -1,9 +1,8 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-<<<<<<< HEAD
-import { Heading, Table, Thead, Tbody, Tr, Th, Td } from '@chakra-ui/react';
-=======
->>>>>>> a8ab90c201bf92f078a3df55ce8bb921238ae03d
+
+import { Heading} from '@chakra-ui/react';
+
 import Nav from '../../components/Nav/Nav';
 import Footer from '../../components/Footer/Footer';
 
@@ -21,11 +20,7 @@ const AyudaSocial = () => {
       <p>{t('pages.helpSocial.description2')}</p>
       <Heading as="h2" size="md">{t('pages.helpSocial.groups')}</Heading>
       <p>{t('pages.helpSocial.description3')}</p>
-<<<<<<< HEAD
       <Footer />
-=======
-      <Footer/>
->>>>>>> a8ab90c201bf92f078a3df55ce8bb921238ae03d
       </>
   );
 };