Display 'Merge Conflict' in changes tables in standard black font

Users find the bold red font too distracting.

Bug: issue 2299
Change-Id: Ia6a114c864930d03a1bd9c1234607b0a90b9d8c4
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java

@@ -171,7 +171,6 @@ public interface GerritCss extends CssResource {
   String negscore();
   String noLineLineNumber();
   String noborder();
-  String notMergeable();
   String notVotable();
   String outdated();
   String parentsTable();

gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java

@@ -215,7 +215,6 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
       table.setText(row, C_STATUS, Util.toLongString(status));
     } else if (!c.mergeable() && useNewFeatures) {
       table.setText(row, C_STATUS, Util.C.changeTableNotMergeable());
-      table.getCellFormatter().addStyleName(row, C_STATUS, Gerrit.RESOURCES.css().notMergeable());
     }
 
     if (c.owner() != null) {

gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css

@@ -544,11 +544,6 @@ a:hover {
   opacity: 0.6;
 }
 
-.changeTable .notMergeable {
-  font-weight: bold;
-  color: #d00;
-}
-
 .accountDashboard.changeTable tr {
   color: #444444;
 }