There is a mysterious conflict in publish-to-pypi that wasn't flagged in the last PR, and weirdly there doesn't actually appear to be a change. But, I forgot to remove the <<<< and >>>> lines and so the upload is broken. Very simple fix
Before submitting
Please check the following:
[x] I have described the situation in which the bug arose, including what code was executed, information about my environment, and any applicable data others will need to reproduce the problem.
[ ] I have included available evidence of the unexpected behavior (including error messages, screenshots, and/or plots) as well as a descriprion of what I expected instead.
[ ] If I have a solution in mind, I have provided an explanation and/or pseudocode and/or task list.
There is a mysterious conflict in publish-to-pypi that wasn't flagged in the last PR, and weirdly there doesn't actually appear to be a change. But, I forgot to remove the
<<<<and>>>>lines and so the upload is broken. Very simple fixBefore submitting Please check the following: