Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Atualiza PR #42 felipebottega master #1

Closed
wants to merge 32 commits into from

Conversation

esloch
Copy link

@esloch esloch commented May 19, 2020

No description provided.

fccoelho and others added 30 commits September 3, 2019 15:24
@felipebottega  vou aceitar este PR  e depois continuamos o trabalho em outro PR
@esloch
Copy link
Author

esloch commented May 19, 2020

Olá Felipe, tivemos um conflito de merge, atualizei aqui localmente os commits com o --rebase, se possível você fazer este merge em seu master, isso atualizará diretamente os commits do PR AlertaDengue#42 que tens em aberto.
Qualquer dúvida estou a disposição.
Agradecido

@esloch
Copy link
Author

esloch commented May 19, 2020

O conflito do PR#42 foi resolvido via github, não se faz necessário o merge deste PR #1 em seu branch master.
Thanks.

@esloch esloch closed this May 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants