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/client/SettingsTableModel.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/client/SettingsTableModel.java b/src/main/java/com/gitblit/client/SettingsTableModel.java
index f14eae4..a781c69 100644
--- a/src/main/java/com/gitblit/client/SettingsTableModel.java
+++ b/src/main/java/com/gitblit/client/SettingsTableModel.java
@@ -26,9 +26,9 @@
/**
* Table model of Map<String, SettingModel>.
- *
+ *
* @author James Moger
- *
+ *
*/
public class SettingsTableModel extends AbstractTableModel {
@@ -89,11 +89,12 @@
/**
* Returns <code>Object.class</code> regardless of <code>columnIndex</code>.
- *
+ *
* @param columnIndex
* the column being queried
* @return the Object.class
*/
+ @Override
public Class<?> getColumnClass(int columnIndex) {
if (Columns.Value.ordinal() == columnIndex) {
return SettingModel.class;
--
Gitblit v1.9.1