summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--1.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/1.md b/1.md
index 67be563..21825cf 100644
--- a/1.md
+++ b/1.md
@@ -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: