From 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 09:31:52 -0400
Subject: [PATCH] Merge overrides in addition to merging the normal settings
---
src/main/java/com/gitblit/client/SettingPanel.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/client/SettingPanel.java b/src/main/java/com/gitblit/client/SettingPanel.java
index 6da09e1..9e64400 100644
--- a/src/main/java/com/gitblit/client/SettingPanel.java
+++ b/src/main/java/com/gitblit/client/SettingPanel.java
@@ -33,7 +33,7 @@
/**
* This panel displays the metadata for a particular setting.
- *
+ *
* @author James Moger
*/
public class SettingPanel extends JPanel {
--
Gitblit v1.9.1