aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-19 00:40:00 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-01-19 00:40:00 +0000
commit1cb3f8d81c2b16d87bd96e5fe102a33bd8b808b8 (patch)
treee7220b20e608be5c6b61415074132e4e8216ab29
parent72cef471bd48778e3000a7d39bfe72b565567837 (diff)
downloadikiwiki-1cb3f8d81c2b16d87bd96e5fe102a33bd8b808b8.tar
ikiwiki-1cb3f8d81c2b16d87bd96e5fe102a33bd8b808b8.tar.gz
response
-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.