mirror of
https://github.com/lightbend/config.git
synced 2025-03-14 19:30:25 +08:00
fix from manual merge
This commit is contained in:
parent
48623a5c44
commit
680ee748dd
@ -52,7 +52,17 @@
|
||||
"ofConfigObject" : [${numbers}, ${booleans}, ${strings}],
|
||||
"ofConfigValue" : [1, 2, "a"],
|
||||
"ofDuration" : [1, 2h, 3 days],
|
||||
"ofMemorySize" : [1024, 1M, 1G]
|
||||
"ofMemorySize" : [1024, 1M, 1G],
|
||||
"ofStringBean" : [
|
||||
{
|
||||
abcd : "testAbcdOne"
|
||||
yes : "testYesOne"
|
||||
},
|
||||
{
|
||||
abcd : "testAbcdTwo"
|
||||
yes : "testYesTwo"
|
||||
}
|
||||
]
|
||||
},
|
||||
"bytes" : {
|
||||
"kilobyte" : "1kB",
|
||||
@ -83,4 +93,4 @@
|
||||
"list" : [1,2,3],
|
||||
"unwrappedMap" : ${validation}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user