Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

PortalMEC-React
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

c881ec63

Commit c881ec63 authored 4 years ago by Henrique Varella Ehrenfried

:speech_balloon:

Downloads
- Plain Diff

Fix merge conflict


Signed-off-by: Henrique V. Ehrenfried <hvehrenfried@inf.ufpr.br>

parents d246e8e7 0e0f0976

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/Components/Header.js 141 additions, 141 deletions

src/Components/Header.js
src/Components/MenuBarMobile.js 31 additions, 31 deletions

src/Components/MenuBarMobile.js
src/Components/MobileDrawerMenu.js 3 additions, 1 deletion

src/Components/MobileDrawerMenu.js
src/Components/TabPanels/PanelComponents/TemplateCuradoria.js 12 additions, 11 deletions

...Components/TabPanels/PanelComponents/TemplateCuradoria.js
src/Components/TabPanels/StyledComponents.js 5 additions, 8 deletions

src/Components/TabPanels/StyledComponents.js
src/Components/UserPageComponents/Cover.js 13 additions, 1 deletion

src/Components/UserPageComponents/Cover.js
src/Components/UserPageComponents/EditProfileButton.js 2 additions, 2 deletions

src/Components/UserPageComponents/EditProfileButton.js

with 207 additions and 195 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment