tree 7ffe308f73914814c12164ff0804c90b54512088
parent 17fbe8bdf5b7b6a9390a26ba630eada0b4ae0c58
author Stephen Li <stephenli@google.com> 1500586329 -0700
committer Stephen Li <stephenli@google.com> 1500586329 -0700

Post merge conflict message even if vote is restricted.

If Code-Review +2/-2 is restricted to a certain group, we still want to
notify users that there is a merge conflict.

Change-Id: I5f41bebfb98dc5859b634e081aabb3405d9367d0