Skip to content

Conversation

@jossue33
Copy link
Contributor

progit2-es/book/09-git-and-other-scms/sections/client-tfs.asc
Line: 159-412
Number of words: 1040

progit2-es/book/09-git-and-other-scms/sections/client-tfs.asc
Line: 159-412
Number of words: 1040
@andres-mancera
Copy link
Member

@jossue33 : No puedo hacer "merge" de este pull request porque hay conflictos. ¿Podrías arreglar esos conflictos y volver a enviar este pull request? Gracias y saludos.

@jossue33
Copy link
Contributor Author

@andres-mancera Ya esta todo listo

@andres-mancera andres-mancera merged commit 087a7ce into progit:master Feb 17, 2018
@andres-mancera
Copy link
Member

Gracias nuevamente @jossue33

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