/portal/urls.py: Merge conflict solved
[myslice.git] / myslice / __init__.py