git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' into tasks/JAL-3311_removeVamsasMenu
[jalview.git]
/
getdown
/
src
/
getdown
/
core
/
src
/
main
/
java
/
com
/
threerings
/
getdown
/
util
/
Config.java
diff --git
a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java
b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java
index
e20bae2
..
6ad2b4f
100644
(file)
--- a/
getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java
+++ b/
getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java
@@
-436,8
+436,8
@@
public class Config
} else if (allowedReplaceKeys.contains(mkey)){
// replace value
-
_data.put(key, nvalue);
+
} else {
log.warning("Not merging key '"+key+"' into config");
}