Commit 45f42ce2 authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict

parents dc646910 cf7f073c