From 4ff1429245b3748372643251a92d71821f257ccf Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 09:36:09 -0400
Subject: [PATCH] Merged #33 "Merge overrides in addition to merging the normal settings"

---
 src/main/java/com/gitblit/wicket/pages/TicketBasePage.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java b/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java
index 3736cdd..60fa638 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketBasePage.java
+++ b/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:

--
Gitblit v1.9.1