Sign previous.

diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn
index 6345cdf9d7f93a6b3ef0730d954b1f4b9ec0d939..31b6c44f9b1b0e9c244d415fac95a9e1a1322c13 100644 (file)
--- a/doc/todo/fancypodcast.mdwn
+++ b/doc/todo/fancypodcast.mdwn
@@ -317,6 +317,8 @@ could negatively impact eg, Planet style aggregators using ikiwiki. --[[Joey]]
     "updo: Eric Raymond: esr"` (article author != feed name, so we get both)
     "updo: Jannis Pohlman: Jannis Pohlmann"` (oops! I tweaked the real updo)
 
+>>>> --[[schmonz]]
+
        +++ b/templates/rsspage.tmpl
        +       xmlns:atom="http://www.w3.org/2005/Atom"
        +<atom:link href="<TMPL_VAR FEEDURL>" rel="self" type="application/rss+xml" />