aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-10-08 19:32:09 -0400
committerJoey Hess <joey@kitenet.net>2010-10-08 19:32:09 -0400
commit59ea972fc91005699b14204c989c2d29997a3009 (patch)
treef7768fe6d5626fbe6f2f93a28ed2c7e3d9ad41e3
parentf826251a6d506d6f8a31e30abfbe89338351bd6a (diff)
downloadikiwiki-59ea972fc91005699b14204c989c2d29997a3009.tar
ikiwiki-59ea972fc91005699b14204c989c2d29997a3009.tar.gz
cleanup
-rw-r--r--doc/todo/web_reversion.mdwn6
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn
index 9550fa58b..736d674fe 100644
--- 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]]