Fix: merge conflict
[myslice.git] / portal / __init__.py