Merged #33 "Merge overrides in addition to merging the normal settings"

James Moger

2014-03-17 4ff1429245b3748372643251a92d71821f257ccf

Merged #33 "Merge overrides in addition to merging the normal settings"

 src/main/java/com/gitblit/IStoredSettings.java

@@ -359,5 +359,6 @@
     */

    public void merge(IStoredSettings settings) {

        getSettings().putAll(settings.getSettings());

        overrides.putAll(settings.overrides);

    }

}