Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/wicket/pages/TicketBasePage.java

@@ -73,6 +73,7 @@
      case Duplicate:

      case Invalid:

      case Wontfix:

      case Abandoned:

         css = "aui-lozenge-error";

         break;

      case Fixed:

@@ -101,6 +102,7 @@
      case Duplicate:

      case Invalid:

      case Wontfix:

      case Abandoned:

         css = "resolution-error";

         break;

      case Fixed: