Skip to content

Commit d85371b

Browse files
committed
fix: macro
1 parent 5e3f63e commit d85371b

File tree

1 file changed

+5
-0
lines changed
  • rust/catalyst-signed-doc-macro/src/rules

1 file changed

+5
-0
lines changed

rust/catalyst-signed-doc-macro/src/rules/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,15 @@ pub(crate) fn catalyst_signed_documents_rules_impl() -> anyhow::Result<TokenStre
1818
crate::validator::rules::Rules {
1919
id: crate::validator::rules::IdRule,
2020
ver: crate::validator::rules::VerRule,
21+
<<<<<<< Updated upstream
2122
content_type: crate::validator::rules::ContentTypeRule {
2223
exp: ContentType::Json,
2324
},
2425
content_encoding: crate::validator::rules::ContentEncodingRule::Specified {
26+
=======
27+
content_type: crate::validator::rules::ContentTypeRule::NotSpecified,
28+
content_encoding: crate::validator::rules::ContentEncodingRule {
29+
>>>>>>> Stashed changes
2530
exp: ContentEncoding::Brotli,
2631
optional: false,
2732
},

0 commit comments

Comments
 (0)