diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-19 08:19:45 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-19 08:19:45 +0000 |
| commit | d36a0300f2a21521d3a121dbe3449483de57ce36 (patch) | |
| tree | 54533034d405442ca5f14ac493d74021b4ff1ffb /doc/bugs/disable_sub-discussion_pages.mdwn | |
| parent | b29dc543ca0bbc66cca1b6441f3738e82f85b4e1 (diff) | |
| download | ikiwiki-d36a0300f2a21521d3a121dbe3449483de57ce36.tar ikiwiki-d36a0300f2a21521d3a121dbe3449483de57ce36.tar.gz | |
web commit by http://getopenid.com/ptecza: Response
Diffstat (limited to 'doc/bugs/disable_sub-discussion_pages.mdwn')
| -rw-r--r-- | doc/bugs/disable_sub-discussion_pages.mdwn | 7 |
1 files changed, 7 insertions, 0 deletions
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 |