merged conflict
[myslice.git] / manifoldapi / __init__.py