From b6976fc0a4b1fd07e1e72fdd06597a0ffb9d48ef Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 02 Dec 2013 15:51:59 -0500 Subject: [PATCH] Merge "Bump bouncycastle version to 1.49" --- src/main/java/com/gitblit/WebXmlSettings.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/WebXmlSettings.java b/src/main/java/com/gitblit/WebXmlSettings.java index 7c8120b..7ae2697 100644 --- a/src/main/java/com/gitblit/WebXmlSettings.java +++ b/src/main/java/com/gitblit/WebXmlSettings.java @@ -31,9 +31,9 @@ /** * Loads Gitblit settings from the context-parameter values of a web.xml file. - * + * * @author James Moger - * + * */ public class WebXmlSettings extends IStoredSettings { @@ -54,7 +54,7 @@ public void applyOverrides(File overrideFile) { this.overrideFile = overrideFile; - + // apply any web-configured overrides if (overrideFile.exists()) { try { -- Gitblit v1.9.1