Skip to content
Snippets Groups Projects
Commit 3c01cf35 authored by florian's avatar florian
Browse files

MAINT: Remove not longer needed conflict files

parent 306b6c2c
No related branches found
No related tags found
1 merge request!7ENH: Add test for extended extern C interface
Pipeline #12134 failed
Stage: info
Stage: setup
Stage: build
Stage: test
This commit is part of merge request !7. Comments created here will be created in the context of that merge request.
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment