fix

Author: apskhem

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

@@ -18,15 +18,8 @@ pub(crate) fn catalyst_signed_documents_rules_impl() -> anyhow::Result<TokenStre
             crate::validator::rules::Rules {
                 id: crate::validator::rules::IdRule,
                 ver: crate::validator::rules::VerRule,
-<<<<<<< Updated upstream
-                content_type: crate::validator::rules::ContentTypeRule {
-                    exp: ContentType::Json,
-                },
-                content_encoding: crate::validator::rules::ContentEncodingRule::Specified {
-=======
                 content_type: crate::validator::rules::ContentTypeRule::NotSpecified,
                 content_encoding: crate::validator::rules::ContentEncodingRule {
->>>>>>> Stashed changes
                     exp: ContentEncoding::Brotli,
                     optional: false,
                 },