fix conflicts .

pull/430/head
misselvexu 3 years ago
commit 023dbe41af

@ -36,6 +36,7 @@ public final class MetadataConstant {
* sct transitive header prefix. * sct transitive header prefix.
*/ */
public static final String SCT_TRANSITIVE_HEADER_PREFIX = "X-SCT-Metadata-Transitive-"; public static final String SCT_TRANSITIVE_HEADER_PREFIX = "X-SCT-Metadata-Transitive-";
/** /**
* sct transitive header prefix length. * sct transitive header prefix length.
*/ */
@ -45,6 +46,7 @@ public final class MetadataConstant {
* polaris transitive header prefix. * polaris transitive header prefix.
*/ */
public static final String POLARIS_TRANSITIVE_HEADER_PREFIX = "X-Polaris-Metadata-Transitive-"; public static final String POLARIS_TRANSITIVE_HEADER_PREFIX = "X-Polaris-Metadata-Transitive-";
/** /**
* polaris transitive header prefix length. * polaris transitive header prefix length.
*/ */

Loading…
Cancel
Save