I think it's just Launchpad or Bunnybot getting confused because of the unmerged prerequisite in their messages. The code in trunk is fine - the new UI test got added. which means that the correct branch was merged.
clang-format separated some translators' comments from their strings though, so I'll have to fix trunk for that.
I think it's just Launchpad or Bunnybot getting confused because of the unmerged prerequisite in their messages. The code in trunk is fine - the new UI test got added. which means that the correct branch was merged.
clang-format separated some translators' comments from their strings though, so I'll have to fix trunk for that.