diff options
Diffstat (limited to 'technical/trivial-merge.html')
| -rw-r--r-- | technical/trivial-merge.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 10cfc7b89..143f56f9b 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -735,7 +735,7 @@ asciidoc.install(); <body class="article">
<div id="header">
<h1>Trivial merge rules</h1>
-<span id="revdate">2023-10-23</span>
+<span id="revdate">2023-10-29</span>
</div>
<div id="content">
<div id="preamble">
@@ -857,7 +857,7 @@ the automatic merge will generally give this effect.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2020-03-11 07:02:33 JST
</div>
</div>
</body>
|