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)

Activity

Show:
Greg Logan
October 21, 2015, 9:04 AM

Merged PR 667 () as d4d8047.

Fixed and reviewed

Assignee

Rüdiger Rolf

Reporter

Rüdiger Rolf

Severity

Incorrectly Functioning With Workaround

Tags (folksonomy)

None

Components

Fix versions

Affects versions

Priority

Major