(no commit message)

diff --git a/doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch.mdwn b/doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch.mdwn
index 7fb44f5a8bdc57bdd325bc4f4a7f2ca516c52e9f..39f9997a2d3f6f2dc6804ff64a366382beb362b4 100644 (file)
--- a/doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch.mdwn
+++ b/doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch.mdwn
@@ -1,5 +1,5 @@
 ### Please describe the problem.
-While on an adjusted branch, merge conflicts neither manually nor with a git merge driver. See the transcript below.
+While on an adjusted branch, merge conflicts can neither be resolved manually nor with a git merge driver. See the transcript below.
 
 
 ### What version of git-annex are you using? On what operating system?