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