From 35bb2253c9ff0dcc44f3245026a141fde6415153 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 19:03:46 -0400
Subject: [PATCH] Merge non-fast-forward for release branch merges
---
src/test/java/com/gitblit/tests/mock/MemorySettings.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/mock/MemorySettings.java b/src/test/java/com/gitblit/tests/mock/MemorySettings.java
index e3f971f..673d3f2 100644
--- a/src/test/java/com/gitblit/tests/mock/MemorySettings.java
+++ b/src/test/java/com/gitblit/tests/mock/MemorySettings.java
@@ -48,6 +48,11 @@
}
@Override
+ public boolean saveSettings() {
+ return false;
+ }
+
+ @Override
public boolean saveSettings(Map<String, String> updatedSettings) {
return false;
}
--
Gitblit v1.9.1