Skip to content

Conversation

@salvadormf
Copy link
Contributor

Hi, I think that next translate is better:
"and to do other things like marking merge-conflicted files as resolved"
"y hacer otras cosas como marcar archivos en conflicto por combinación como resueltos"

Hi, I think that next translate is better:
"and to do other things like marking merge-conflicted files as resolved"
"y hacer otras cosas como marcar archivos en conflicto por combinación como resueltos"
@andres-mancera andres-mancera merged commit a4091f7 into progit:master Jan 29, 2021
@andres-mancera
Copy link
Member

Gracias @salvadormf

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.

2 participants