tree c7d5dce4cc01a7ac1317fe65bb96c7f7bdd86081
parent 3ef8c296bd93b9146fd3824de6660c9d70204481
author Peter von der Ahé <ahe@google.com> 1547563264 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> 1547563264 +0000

Don't report conflicts twice

Change-Id: I9dca391da6a2afc747fcf73656ab0224201cb097
Reviewed-on: https://dart-review.googlesource.com/c/88943
Reviewed-by: Dmitry Stefantsov <dmitryas@google.com>