From 2a31e5c6605d7685200ce9cf07703e5304c2c783 Mon Sep 17 00:00:00 2001
From: Brandon Fergerson <brandon.fergerson@codebrig.com>
Date: Tue, 12 Mar 2019 22:55:41 -0600
Subject: [PATCH] fix merge

---
 .../java/org/apache/skywalking/apm/agent/core/conf/Config.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
index 19f18bcaa8..9104c1cb9f 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
@@ -193,4 +193,5 @@ public class Config {
              */
             public static boolean USE_QUALIFIED_NAME_AS_ENDPOINT_NAME = false;
         }
+    }
 }
-- 
GitLab