Skip to content

Commit

Permalink
Borrar salida redundante
Browse files Browse the repository at this point in the history
  • Loading branch information
fraya committed Jul 31, 2024
1 parent 8a95b6d commit 4b1cde9
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions documentation/source/git-ramas.rst
Original file line number Diff line number Diff line change
Expand Up @@ -463,12 +463,6 @@ Y resolvemos el conflicto confirmando los cambios:
$ git commit -m "Solucionado el conflicto al fusionar con la rama main"
.. code-block:: console
:caption: Salida del comando de la fusión
$ git commit -m "Solucionado el conflicto al fusionar con la rama main"
[saludo-moderno b829314] Solucionado el conflicto al fusionar con la rama main
.. code-block:: console
$ git checkout main
Expand Down

0 comments on commit 4b1cde9

Please sign in to comment.