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/ExternalImage.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/ExternalImage.java b/src/main/java/com/gitblit/wicket/ExternalImage.java
index 3325774..34adb1e 100644
--- a/src/main/java/com/gitblit/wicket/ExternalImage.java
+++ b/src/main/java/com/gitblit/wicket/ExternalImage.java
@@ -27,6 +27,7 @@
 		super(id, new Model<String>(url));
 	}
 
+	@Override
 	protected void onComponentTag(ComponentTag tag) {
 		super.onComponentTag(tag);
 		checkComponentTag(tag, "img");

--
Gitblit v1.9.1