Dear list, I proposed Trac#22189 <https://trac.sagemath.org/ticket/22189> to (start to) solve our OpenSSL conundrum. This patch was originally one commit. At the suggestion of a reviewer,, I added a second patch, changing the target Sage version. This second patch, somehow, conflicted with 7.6.beta1.
I squashed the two commits in one and forced an update. The merge with 7.6.beta1 is still impossible without manual intervention. Could some king suol point me to an answer to two simple questions : 1. Where did goof ? 2. How to solve that ? Sincerely, -- Emmanuel Charpentier -- 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 post to this group, send email to sage-devel@googlegroups.com. Visit this group at https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
