Merge "RCFilters UI: Adopt conflict colors"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 3 Mar 2017 19:32:06 +0000 (19:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 3 Mar 2017 19:32:06 +0000 (19:32 +0000)

Trivial merge