From 1a65f861b272284f870fcc12bf46c3b144aaba97 Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@pobox.com>
Date: Wed, 22 Oct 2014 13:54:48 -0400
Subject: [PATCH] ConfigDelayedMerge.java: Fix indentation

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

diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java b/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java
index 2893faf8..88cce187 100644
--- a/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java
+++ b/config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java
@@ -116,8 +116,7 @@ final class ConfigDelayedMerge extends AbstractConfigValue implements Unmergeabl
                 sourceForEnd = sourceForEnd.resetParents();
             } else {
                 if (ConfigImpl.traceSubstitutionsEnabled())
-                    ConfigImpl
-.trace(newContext.depth(),
+                    ConfigImpl.trace(newContext.depth(),
                             "will resolve end against the original source with parent pushed");
 
                 sourceForEnd = source.pushParent(replaceable);