summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/bugs/disable_sub-discussion_pages.mdwn4
1 files changed, 3 insertions, 1 deletions
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.