From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 19 Jan 2007 00:40:00 +0000 (+0000)
Subject: response
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/1cb3f8d81c2b16d87bd96e5fe102a33bd8b808b8

response
---

diff --git a/doc/bugs/disable_sub-discussion_pages.mdwn b/doc/bugs/disable_sub-discussion_pages.mdwn
index bfefd8a05..d699ead40 100644
--- a/doc/bugs/disable_sub-discussion_pages.mdwn
+++ b/doc/bugs/disable_sub-discussion_pages.mdwn
@@ -45,4 +45,6 @@ I do want discussion subpage, but I don't want to have, for example: discussion/
 >>>>        make[1]: Leaving directory `/home/ptecza/svn/ikiwiki'
 >>>>        make: *** [build-stamp] Error 2
 
->>>> I think you should be notified about it :) --Pawel
\ No newline at end of file
+>>>> I think you should be notified about it :) --Pawel
+
+>>>>> You have an unresolved svn conflict in some files in po, looks like.