From 7d32bae8f3bb190ec7e5d4b2eea39d8a62c63e16 Mon Sep 17 00:00:00 2001
From: Riba <mrp19@inf.ufpr.br>
Date: Mon, 27 Jan 2020 12:08:55 -0300
Subject: [PATCH] Fix resourseCard.js Type Array (Livro digital)

---
 src/App.js                     | 6 ++----
 src/Components/ResourceCard.js | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/App.js b/src/App.js
index 922949aa..c2d92119 100644
--- a/src/App.js
+++ b/src/App.js
@@ -70,12 +70,10 @@ export default function App(){
         <Route path="/busca" component={Search} />
         <Route path="/usuario" component={UserPage} />
         <Route path="/recurso" component={ResourcePage}/>
-<<<<<<< HEAD
-      	<Route path="/termos" component={UserTerms}/>
-=======
+
       	<Route path="/termos" component={UserTerms}/>
         <Route path="/teste" component={Teste}/>
->>>>>>> 3ddcc71da0ad68662cfa886d12da8bc55c9a69b2
+
       </Switch>
       <EcFooter/>
       <GNUAGPLfooter/>
diff --git a/src/Components/ResourceCard.js b/src/Components/ResourceCard.js
index a5eb7c12..a5987b00 100644
--- a/src/Components/ResourceCard.js
+++ b/src/Components/ResourceCard.js
@@ -48,7 +48,7 @@ import Video from '@material-ui/icons/OndemandVideo';
 import noAvatar from "../img/default_profile.png";
 
 const types = [{label: "Animação", thumb: animacao}, {label: "Apresentação", thumb: apresentacao},
-{label: "Aplicativo" , thumb: aplicativo}, {label: "Áudio", thumb: audio}, {label: "Vazio", thumb: vazio}, {label: "Imagem", thumb: imagem}, {label: "Gráfico", thumb: grafico}, {label: "Jogo", thumb: jogo}, {label: "Livro", thumb: livro}, {label: "Mapa", thumb: mapa}, {label: "Outros", thumb: outros}, {label: "Software Educacional", thumb:software}, {label: "Texto", thumb:texto}, {label: "Vídeo", thumb:video}]
+{label: "Aplicativo" , thumb: aplicativo}, {label: "Áudio", thumb: audio}, {label: "Vazio", thumb: vazio}, {label: "Imagem", thumb: imagem}, {label: "Gráfico", thumb: grafico}, {label: "Jogo", thumb: jogo}, {label: "Livro digital", thumb: livro}, {label: "Livro", thumb: livro}, {label: "Mapa", thumb: mapa}, {label: "Outros", thumb: outros}, {label: "Software Educacional", thumb:software}, {label: "Texto", thumb:texto}, {label: "Vídeo", thumb:video}]
 const slideStyle={
   height: "50px",
   width: "50px",
-- 
GitLab