diff options
| author | ven <vendethiel@hotmail.fr> | 2015-07-04 08:50:25 +0200 |
|---|---|---|
| committer | ven <vendethiel@hotmail.fr> | 2015-07-04 08:50:25 +0200 |
| commit | 89e2a788d88132bfb4d09eadd12a4ff55b431627 (patch) | |
| tree | 59ef2365ad8f29d51a336cf581c491ff9228fb4d /es-es/git-es.html.markdown | |
| parent | ed8f34eb3337bd78e2dca23be34746d01272f1ae (diff) | |
| parent | 9f17872f21bc3a43a1023325414802c2e4467534 (diff) | |
Merge pull request #1158 from leio10/patch-1
Update git-es.html.markdown
Diffstat (limited to 'es-es/git-es.html.markdown')
| -rw-r--r-- | es-es/git-es.html.markdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/es-es/git-es.html.markdown b/es-es/git-es.html.markdown index 5c9d3378..73853a9d 100644 --- a/es-es/git-es.html.markdown +++ b/es-es/git-es.html.markdown @@ -38,7 +38,7 @@ uno o varios archivos, a lo largo del tiempo. * Se puede trabajar sin conexion. * Colaborar con otros es sencillo!. * Derivar, Crear ramas del proyecto (aka: Branching) es facil!. -* Combinar (aka: Marging) +* Combinar (aka: Merging) * Git es rapido. * Git es flexible. |