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/GoogleCharts.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/charting/GoogleCharts.java b/src/main/java/com/gitblit/wicket/charting/GoogleCharts.java
index 77c522b..8b72793 100644
--- a/src/main/java/com/gitblit/wicket/charting/GoogleCharts.java
+++ b/src/main/java/com/gitblit/wicket/charting/GoogleCharts.java
@@ -13,7 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-
package com.gitblit.wicket.charting;
import java.util.ArrayList;
@@ -26,9 +25,9 @@
* The Google Visualization API provides interactive JavaScript based charts and
* graphs. This class implements the JavaScript header necessary to display
* complete graphs and charts.
- *
+ *
* @author James Moger
- *
+ *
*/
public class GoogleCharts implements IHeaderContributor {
--
Gitblit v1.9.1