From 2566973fdd07fd7f1cdee96a496b9746cd8cef16 Mon Sep 17 00:00:00 2001
From: Ryan O'Neill <roneill@twitter.com>
Date: Thu, 13 Aug 2015 15:02:40 -0700
Subject: [PATCH] formatting

---
 .../main/java/com/typesafe/config/impl/SimpleConfigObject.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java b/config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java
index 20255d3c..7f437f37 100644
--- a/config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java
+++ b/config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java
@@ -418,8 +418,7 @@ final class SimpleConfigObject extends AbstractConfigObject implements Serializa
             for (ConfigConditional cond: this.conditionals) {
                 SimpleConfigObject body = cond.resolve(context, sourceWithParent);
                 AbstractConfigObject resolvedBody = body.resolveSubstitutions(context, source).value;
-//                if (resolvedBody != SimpleConfigObject.empty())
-                    value = value.mergedWithObject(resolvedBody);
+                value = value.mergedWithObject(resolvedBody);
             }
 
             return ResolveResult.make(modifier.context, value).asObjectResult();