Skip to content
Snippets Groups Projects
Commit 2cc20883 authored by Lucas Eduardo Schoenfelder's avatar Lucas Eduardo Schoenfelder
Browse files

fix incorrect merge

parent 3ccbf918
Branches
Tags
4 merge requests!57Merge of develop into master,!56Fixed buttons reportar, seguir, compartilhar, guardar and entrar (in comments...,!39Update admin system,!32Homologa
......@@ -94,10 +94,6 @@ export default function Header(props){
sessionStorage.setItem('@portalmec/id', response.data.data.id)
sessionStorage.setItem('@portalmec/username', response.data.data.name)
sessionStorage.setItem('@portalmec/uid', response.data.data.uid)
<<<<<<< HEAD
=======
sessionStorage.setItem('@portalmec/senha', login.senha)
>>>>>>> 0624e7d3f8ea41e030046161ee6a40f59219c70b
},
(err) => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment