diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-17 07:36:09 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-03-17 07:36:09 -0600 |
| commit | 4ff1429245b3748372643251a92d71821f257ccf (patch) | |
| tree | 9ee44978c1f7be14f50c2f42981142cf26ff6bb9 /src/main/java/com/gitblit/IStoredSettings.java | |
| parent | f8c1913bd9fb332bfa3ff722f6870216d5194c6f (diff) | |
| parent | 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7 (diff) | |
| download | gitblit-4ff1429245b3748372643251a92d71821f257ccf.tar.gz gitblit-4ff1429245b3748372643251a92d71821f257ccf.zip | |
Merged #33 "Merge overrides in addition to merging the normal settings"
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 |