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/charting/GoogleChart.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/charting/GoogleChart.java b/src/main/java/com/gitblit/wicket/charting/GoogleChart.java
index 334b870..a718835 100644
--- a/src/main/java/com/gitblit/wicket/charting/GoogleChart.java
+++ b/src/main/java/com/gitblit/wicket/charting/GoogleChart.java
@@ -23,9 +23,9 @@
/**
* Abstract parent class for Google Charts built with the Visualization API.
- *
+ *
* @author James Moger
- *
+ *
*/
public abstract class GoogleChart implements Serializable {
@@ -57,7 +57,7 @@
public void setHeight(int height) {
this.height = height;
}
-
+
public void setShowLegend(boolean val) {
this.showLegend = val;
}
--
Gitblit v1.9.1