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/panels/DropDownMenu.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/DropDownMenu.java b/src/main/java/com/gitblit/wicket/panels/DropDownMenu.java index 60a8a3d..d1a632e 100644 --- a/src/main/java/com/gitblit/wicket/panels/DropDownMenu.java +++ b/src/main/java/com/gitblit/wicket/panels/DropDownMenu.java @@ -38,6 +38,7 @@ DataView<DropDownMenuItem> view = new DataView<DropDownMenuItem>("menuItems", items) { private static final long serialVersionUID = 1L; + @Override public void populateItem(final Item<DropDownMenuItem> item) { DropDownMenuItem entry = item.getModelObject(); if (entry.isDivider()) { -- Gitblit v1.9.1