diff options
Diffstat (limited to 'src/main/java/com/gitblit/IStoredSettings.java')
| -rw-r--r-- | src/main/java/com/gitblit/IStoredSettings.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/IStoredSettings.java b/src/main/java/com/gitblit/IStoredSettings.java index 6b58e89a..9c7a2d23 100644 --- a/src/main/java/com/gitblit/IStoredSettings.java +++ b/src/main/java/com/gitblit/IStoredSettings.java @@ -359,5 +359,6 @@ public abstract class IStoredSettings { */
public void merge(IStoredSettings settings) {
getSettings().putAll(settings.getSettings());
+ overrides.putAll(settings.overrides);
}
}
\ No newline at end of file |