On Fri, Feb 22, 2008 at 11:15 AM, Georg Brandl <[EMAIL PROTECTED]> wrote: > [EMAIL PROTECTED] schrieb: > > > This message has been popping up in the buildbot mails for several days: > > > > > Conflict detected in commontex/boilerplate.tex. Doc build skipped. > > > > I have no idea what it means. I don't see it within the core distribution. > > Can someone take a look at this? > > Neal will have to fix it locally in his checkout. The message is generated by > his automatic doc building script.
Yeah, I fixed it. I have an outstanding change that is set to today so the docs show the correct date. But when I release is made, a conflict arises, so I have to fix manually each time the file is modified. n _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
