Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / doc / todo / web_reversion.mdwn

diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn
index 9550fa58b976974ad2910d0a68bd3bb825836f5c..736d674feb242b20e7daadc1a5fe6d3cae00bbc0 100644 (file)
--- a/doc/todo/web_reversion.mdwn
+++ b/doc/todo/web_reversion.mdwn
@@ -67,9 +67,7 @@ Peter Gammie has done an initial implementation of the above.
 >>
 >> Please look it over and tell me what else needs fixing... -- [[peteg]]
 
->>> I have made my own revert branch and put a few fixes in there
->>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]]
->>> (and fixed all the indention..). --[[Joey]] 
->>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]]
+>>> I have made my own revert branch and put a few^Wseveral fixes in there.
+>>> All merged to master now! --[[Joey]] 
 
 [[done]]