X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cf3e3c5a8849dcf7f43d055bb9555e088651bae4..4729ff0812c1f3d06d98524e2fec232d3bf90513:/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn

diff --git a/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
index e5a8d0ab9..6d702fedf 100644
--- a/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
+++ b/doc/todo/edittemplate_should_support_uuid__44___date_variables.mdwn
@@ -83,3 +83,5 @@ Changes to the structure of `$pagestate{$registering_page}{edittemplate}{$pagesp
 >>>>> almost 5 years ago. Branch replaced by `smcv/ready/edittemplate2`
 >>>>> which drops `formatted_time` and `html_time`, and adds a suggestion
 >>>>> to use `\[[!date]]`. --[[smcv]]
+
+>>>>>> [[merged|done]] --[[smcv]]