X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1cb3f8d81c2b16d87bd96e5fe102a33bd8b808b8..bd7c6d62fc7907e98214952437f18f3e42a99a6b:/doc/bugs/disable_sub-discussion_pages.mdwn?ds=inline

diff --git a/doc/bugs/disable_sub-discussion_pages.mdwn b/doc/bugs/disable_sub-discussion_pages.mdwn
index d699ead40..d9afac7ff 100644
--- a/doc/bugs/disable_sub-discussion_pages.mdwn
+++ b/doc/bugs/disable_sub-discussion_pages.mdwn
@@ -48,3 +48,10 @@ I do want discussion subpage, but I don't want to have, for example: discussion/
 >>>> I think you should be notified about it :) --Pawel
 
 >>>>> You have an unresolved svn conflict in some files in po, looks like.
+
+>>>>>> Thanks for the hint! You're absolutely right again, Joey! It's because of
+>>>>>> I always do `svn up` command (for CVS repo `cvs up` is enough :) )
+>>>>>> and I never use `svn status` command. Yes, now I know I should do it :)
+
+>>>>>> First I removed conflicting `sv.po` file and next I updated it and
+>>>>>> it has resolved the problem. --Pawel