Merge remote-tracking branch 'spalax/calendar-autocreate'

[ikiwiki.git] / doc / bugs / template_creation_error.mdwn

diff --git a/doc/bugs/template_creation_error.mdwn b/doc/bugs/template_creation_error.mdwn
index d1fb788f5287878f28910e6a1def1e0336e18cd1..33a863ec56aa431bd83136dcdfa08b74886b29aa 100644 (file)
--- a/doc/bugs/template_creation_error.mdwn
+++ b/doc/bugs/template_creation_error.mdwn
@@ -268,3 +268,5 @@ same logic as IkiWiki itself. I don't think that's serious. --[[smcv]]
 >>>> advocate), that should likewise warn if `add_link` actually adds a link in
 >>>> the render phase.  such a warning would have helped spotting the
 >>>> link-related [[template evaluation oddities]] earlier. --[[chrysn]]
+
+>>>>> [[Merged|done]] --[[smcv]]