From 4ff1429245b3748372643251a92d71821f257ccf Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 09:36:09 -0400
Subject: [PATCH] Merged #33 "Merge overrides in addition to merging the normal settings"
---
src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java b/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
index aaa6c66..8e518de 100644
--- a/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
+++ b/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
@@ -137,7 +137,7 @@
}
@Override
- public IRuntimeManager setup() {
+ public IRuntimeManager start() {
return this;
}
}
--
Gitblit v1.9.1