resolve confilct

a49a · a49a · commit 8a5392f3db93 · 2020-09-17T18:41:26.000+08:00
diff --git a/core/src/main/java/com/dtstack/flink/sql/util/KrbUtils.java b/core/src/main/java/com/dtstack/flink/sql/util/KrbUtils.java
@@ -50,4 +50,5 @@ public static UserGroupInformation getUgi(String principal, String keytabPath, S
         UserGroupInformation.setConfiguration(configuration);
         return UserGroupInformation.loginUserFromKeytabAndReturnUGI(principal, keytabPath);
     }
+    
 }

Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,5 @@ public static UserGroupInformation getUgi(String principal, String keytabPath, S`
`50`	`50`	`UserGroupInformation.setConfiguration(configuration);`
`51`	`51`	`return UserGroupInformation.loginUserFromKeytabAndReturnUGI(principal, keytabPath);`
`52`	`52`	`}`
	`53`	`+`
`53`	`54`	`}`