Fix: merge conflict
[myslice.git] / to-be-integrated / plugins / pres_view / templates / pres_view.html