diff options
-rw-r--r-- | 1.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -449,7 +449,7 @@ Automatic merge failed; fix conflicts and then commit the result. ``` -## Konfliktoak - II +## Konfliktoak — II ``` $ git status @@ -466,7 +466,7 @@ no changes added to commit (use "git add" and/or "git commit -a") ``` -## Konfliktoak - III +## Konfliktoak — III Fitxategia horrela ikusten da: |