From 4975421fb2b3b7e8609d556a276a500fdc46563b Mon Sep 17 00:00:00 2001
From: Laurent Martelli <martellilaurent@gmail.Com>
Date: Tue, 1 Oct 2019 14:46:40 +0200
Subject: [PATCH] Fix typo

---
 doc/git-conflict.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/git-conflict.html b/doc/git-conflict.html
index 53196cc..1f0ce26 100644
--- a/doc/git-conflict.html
+++ b/doc/git-conflict.html
@@ -816,7 +816,7 @@ <h2 id="_internals">INTERNALS</h2>
 <div class="sect1">
 <h2 id="_limitations">LIMITATIONS</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Currently, when reapplying a resolution, it will only look at <code>both modified</code> files. So conflicts with renames, mod changes and deletions are not handled. In addition, If you changed something in a file that wasn&#8217;t in conflict state, it won&#8217;t be reapply neither.</p></div>
+<div class="paragraph"><p>Currently, when reapplying a resolution, it will only look at <code>both modified</code> files. So conflicts with renames, mod changes and deletions are not handled. In addition, If you changed something in a file that wasn&#8217;t in conflict state, it won&#8217;t be reapplied neither.</p></div>
 <div class="paragraph"><p>Managing conflicts with more than a single branch is subtle. Let&#8217;s say I&#8217;m on a local branch <code>topic_mine</code> and I have two different conflicts with <code>topic_arya</code> and <code>topic_eddard</code></p></div>
 <div class="listingblock">
 <div class="content">