Changes between Initial Version and Version 1 of Ticket #30777, comment 8


Ignore:
Timestamp:
Nov 1, 2020, 7:04:17 AM (2 years ago)
Author:
gh-kliem
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #30777, comment 8

    initial v1  
    1 I pulled in #30776 and fixed the trivial merge conflict (to new definitions in `.pxd` at same place).
     1I pulled in #30776 and fixed the trivial merge conflict (two new definitions in `.pxd` at same place).
    22
    33It is not clear to me, why both #30776 and #30777 were marked as merge conflict.