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

Cambios de sintaxis y errores de dedo. #80

Merged
merged 5 commits into from
Apr 27, 2023

Conversation

shirleyah
Copy link
Contributor

Se hicieron cambios de sintaxis, errores de dedo y acentos.

Se cambió alquien por alguien y solapado por sobrepuesto.
Cambio: escribir por sobreescribir
@zkamvar
Copy link
Contributor

zkamvar commented Apr 27, 2023

Note: the conflict was complicated because GitHub was recognising the demo conflict in https://github.com/swcarpentry/git-novice-es/pull/80/files#diff-d6a99febf97741266cb7e7ddaba62b8ee45f0b577ad76a0c2d3caf31a150a9a4L175-L179 as an actual conflict. I deleted two characters to make the merge and now I will re-add them.

@zkamvar zkamvar merged commit 8a2d55d into swcarpentry:gh-pages Apr 27, 2023
zkamvar added a commit that referenced this pull request Apr 27, 2023
Cambios de sintaxis y errores de dedo.
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.

4 participants