From ac386bc7b69a8bf946918c0b46533975d249cf97 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Wed, 17 Jul 2013 16:47:57 -0400
Subject: [PATCH 1/1] Sign previous.

---
 doc/todo/fancypodcast.mdwn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn
index 6345cdf9d..31b6c44f9 100644
--- 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" />
-- 
2.39.5