Problems in Theodul controls plugin due to wrong resolves of merge conflicts

Steps to reproduce

Steps to reproduce:
1. Qualities selector not available
2. Logo too large (if different logo was configured)

Assignee

Rüdiger Rolf

Reporter

Rüdiger Rolf

Severity

Incorrectly Functioning With Workaround

Tags (folksonomy)

None

Components

Fix versions

Affects versions

Priority

Major
Configure