Commit eecc3f44 authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict.

parents 083bc63a 45b0764c