summaryrefslogtreecommitdiffstats
path: root/technical/trivial-merge.html
diff options
context:
space:
mode:
Diffstat (limited to 'technical/trivial-merge.html')
-rw-r--r--technical/trivial-merge.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html
index 35a9afe78..e627da80a 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">2024-03-21</span>
+<span id="revdate">2024-03-25</span>
</div>
<div id="content">
<div id="preamble">