fix conflicts .

3 years ago · 023dbe41af
parent 6f5e853d26 be8996892a
commit 023dbe41af
1 changed files with 2 additions and 0 deletions
--- a/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/MetadataConstant.java
+++ b/spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/MetadataConstant.java
@ -36,6 +36,7 @@ public final class MetadataConstant {
 	 * sct transitive header prefix.
 	 */
 	public static final String SCT_TRANSITIVE_HEADER_PREFIX = "X-SCT-Metadata-Transitive-";
+
 	/**
 	 * sct transitive header prefix length.
 	 */
@ -45,6 +46,7 @@ public final class MetadataConstant {
 	 * polaris transitive header prefix.
 	 */
 	public static final String POLARIS_TRANSITIVE_HEADER_PREFIX = "X-Polaris-Metadata-Transitive-";
+
 	/**
 	 * polaris transitive header prefix length.
 	 */