From: joey Date: Fri, 19 Jan 2007 08:19:45 +0000 (+0000) Subject: web commit by http://getopenid.com/ptecza: Response X-Git-Tag: 1.41~84 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d36a0300f2a21521d3a121dbe3449483de57ce36;p=ikiwiki.git web commit by getopenid.com/ptecza: Response --- 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