From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result
---
src/main/java/com/gitblit/wicket/StringChoiceRenderer.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/StringChoiceRenderer.java b/src/main/java/com/gitblit/wicket/StringChoiceRenderer.java
index 58ed479..cd26965 100644
--- a/src/main/java/com/gitblit/wicket/StringChoiceRenderer.java
+++ b/src/main/java/com/gitblit/wicket/StringChoiceRenderer.java
@@ -20,14 +20,14 @@
/**
* Choice renderer for a palette or list of string values. This renderer
* controls the id value of each option such that palettes are case insensitive.
- *
+ *
* @author James Moger
*
*/
public class StringChoiceRenderer extends ChoiceRenderer<String> {
private static final long serialVersionUID = 1L;
-
+
public StringChoiceRenderer() {
super("", "");
}
--
Gitblit v1.9.1