fix from manual merge

This commit is contained in:
Ryan O'Neill 2015-08-06 14:11:37 -07:00
parent 48623a5c44
commit 680ee748dd

View File

@ -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}
}
}
}