Sorry for inconvenience. Please merge https://github.com/sagemath/sage/pull/38468.
On Tuesday, September 3, 2024 at 6:41:23 AM UTC+9 dim...@gmail.com wrote: > On https://github.com/sagemath/sage/pull/38486 > I get a weird error from the CI docbuild. > Apparently it's incremental, and tries (and fails) to merge the updated > html file into the previous version (?). In the log I see: > > CONFLICT (content): Merge conflict in > html/en/reference/combinat/sage/combinat/matrices/hadamard_matrix.html > > The docs build just fine on "real" machine, and also, CI pdf docbuild > succeeds. > > Is it a bug in the CI docbuild? > > Dima > -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/sage-devel/3bb7cdb7-634f-48cf-af56-9ad5b99a809dn%40googlegroups.com.
