diff options
| author | Geoff Liu <g@geoffliu.me> | 2015-08-30 14:22:11 -0600 |
|---|---|---|
| committer | Geoff Liu <g@geoffliu.me> | 2015-08-30 14:22:11 -0600 |
| commit | eb7e58d5fc649ed2713c7685539bd5edcd9e8ade (patch) | |
| tree | 72a9fe5106bed0735089b5c7a2b22540f7ebb3a7 /es-es/git-es.html.markdown | |
| parent | 1d1def16a5d7925bb8f7fba7dc49182e33359e85 (diff) | |
| parent | b124fd58df56a5e1ee9925481fbde1f22ccfb386 (diff) | |
Merge remote-tracking branch 'upstream/master'
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. |