Commit 2d0fff42 authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflicts.

parents 602f098c f51f2c58