Character classes#251
Closed
cortizg wants to merge 2 commits intojavascript-tutorial:masterfrom
cortizg:es.javascript.info.9-02-cc
Closed
Character classes#251cortizg wants to merge 2 commits intojavascript-tutorial:masterfrom cortizg:es.javascript.info.9-02-cc
cortizg wants to merge 2 commits intojavascript-tutorial:masterfrom
cortizg:es.javascript.info.9-02-cc
Conversation
Contributor
|
hay conflictos @cortizg vas a tener que cerrar y crear otro PR. |
Contributor
Author
|
Revisaré |
Contributor
Author
|
Pero son conflictos de idioma no?? Además lo dejo como el original EN, me refiero a la estructura de archivos |
Contributor
Author
|
No sé si soy yo.... Pero no veo los conflictos |
Contributor
|
@cortizg No, son mayormente conflictos de nombramiento de carpetas, que fueron cambiadas con la sincronzación. Debes ver como está el nombramiento tras la sincronización y hacer los cambios. |
Contributor
Author
|
Ok |
Contributor
Author
|
Veo la diferencia: las carpetas las renombre tal como están en el repo EN, algunas ya no existirán en ES, creo q ese es el conflicto |
Contributor
Author
|
Revisaré con más calma en casa |
Contributor
Author
|
Cerrado, tengo que actualizar mi fork |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
9-02-cc Traducido 21