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

diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index b7ab8102a1e4dfbc390617ff8df86f0fac1e3cea..7dd7c4f513866828aa1ec12a886e8bc614d996cf 100644 (file)
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,3 +1,3 @@
 My watchlist:
 
-[[inline pages="todo/allow_wiki_syntax_in_commit_messages" archive="yes" feeds="yes" sort="mtime" atom="yes"]]
+[[inline pages="todo/allow_wiki_syntax_in_commit_messages" archive="yes" atom="yes" sort="mtime" atom="yes"]]