diff --git a/webapp/src/pages/Ayuda/AyudaEstadisticas.js b/webapp/src/pages/Ayuda/AyudaEstadisticas.js index c155e9fc..4aeb8b3f 100644 --- 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 index ef1aad0a..0f751b35 100644 --- 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 index 4a90e261..3d154f61 100644 --- 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 = () => {
{t('pages.helpSocial.description2')}
{t('pages.helpSocial.description3')}
-<<<<<<< HEAD -======= - ->>>>>>> a8ab90c201bf92f078a3df55ce8bb921238ae03d > ); };