Autogenerated HTML docs for v2.15.1-501-g29533f

1 files changed, 3 insertions, 3 deletions

diff --git a/gitworkflows.html b/gitworkflows.html
index 6b631e43b..47f2e0bda 100644
--- a/gitworkflows.html
+++ b/gitworkflows.html
@@ -1147,8 +1147,8 @@ follows.</p></div>
 <div class="content">

 <div class="paragraph"><p><code>git pull &lt;url&gt; &lt;branch&gt;</code></p></div>

 </div></div>

-<div class="paragraph"><p>Occasionally, the maintainer may get merge conflicts when he tries to

-pull changes from downstream.  In this case, he can ask downstream to

+<div class="paragraph"><p>Occasionally, the maintainer may get merge conflicts when they try to

+pull changes from downstream.  In this case, they can ask downstream to

 do the merge and resolve the conflicts themselves (perhaps they will

 know better how to resolve them).  It is one of the rare cases where

 downstream <em>should</em> merge from upstream.</p></div>

@@ -1228,7 +1228,7 @@ other options.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2017-11-10 15:00:41 JST

+Last updated 2017-12-27 11:58:06 PST

 </div>

 </div>

 </body>