web commit by JoshTriplett: Same thing observed via lintian

[git.ikiwiki.info.git] / doc / bugs / disable_sub-discussion_pages.mdwn

diff --git a/doc/bugs/disable_sub-discussion_pages.mdwn b/doc/bugs/disable_sub-discussion_pages.mdwn
index bfefd8a052077a83a6034e0c3d9a57a7702814ec..d9afac7ff8b1732aed335f5eb7065f46958b22b3 100644 (file)
--- a/doc/bugs/disable_sub-discussion_pages.mdwn
+++ b/doc/bugs/disable_sub-discussion_pages.mdwn
@@ -45,4 +45,13 @@ 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.
+
+>>>>>> 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