Changes between Initial Version and Version 1 of Ticket #30777, comment 8
- Timestamp:
- Nov 1, 2020, 7:04:17 AM (2 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Ticket #30777, comment 8
initial v1 1 I pulled in #30776 and fixed the trivial merge conflict (t o new definitions in `.pxd` at same place).1 I pulled in #30776 and fixed the trivial merge conflict (two new definitions in `.pxd` at same place). 2 2 3 3 It is not clear to me, why both #30776 and #30777 were marked as merge conflict.