Documentation

James Moger

2014-03-18 af2c4a191aa8cfa34435ba67f09e2a1bea86afb0

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

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

   public void merge(IStoredSettings settings) {

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

      overrides.putAll(settings.overrides);

   }

}