Fix: merge conflic /portal/views.py
[myslice.git] / portal / static / img / resource-icon.png
portal/static/img/resource-icon.png