minor conflict fixed
[myslice.git] / plugins / hazelnut / __init__.py