Skip to content
Snippets Groups Projects
Commit cb7ac35d authored by Mariana Moreira's avatar Mariana Moreira
Browse files

Merge branch 'development' into '12-criar-footer'

# Conflicts:
#   src/App.js
parents 333dc268 d45fd498
No related branches found
No related tags found
4 merge requests!58Version 1.1,!54Issue #53: Fix password info,!15Issue/4,!8Resolve "Criar Footer"
...@@ -10,7 +10,6 @@ function App() { ...@@ -10,7 +10,6 @@ function App() {
<HashRouter> <HashRouter>
<Route path="/create" component={CreateForm} /> <Route path="/create" component={CreateForm} />
<Route path="/answer/:id" component={AnswerForm} /> <Route path="/answer/:id" component={AnswerForm} />
<Footer />
</HashRouter> </HashRouter>
); );
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment