From 680ee748ddada7857b5cdac60d7943c8e2555ed7 Mon Sep 17 00:00:00 2001
From: Ryan O'Neill <roneill@twitter.com>
Date: Thu, 6 Aug 2015 14:11:37 -0700
Subject: [PATCH] fix from manual merge

---
 .../test/resources/beanconfig/beanconfig01.conf    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/config/src/test/resources/beanconfig/beanconfig01.conf b/config/src/test/resources/beanconfig/beanconfig01.conf
index d17c0468..cff1a8af 100644
--- a/config/src/test/resources/beanconfig/beanconfig01.conf
+++ b/config/src/test/resources/beanconfig/beanconfig01.conf
@@ -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}
     }
-}
+}
\ No newline at end of file