rebase

index.html

@@ -674,25 +674,12 @@ <h2 id="securing-with-sd-jwt">Securing JSON-LD Verifiable Credentials with SD-JW
             <p>
                 When securing [=verifiable credentials=] with [[SD-JWT]], implementers SHOULD ensure that
                 properties necessary for the validation and verification of a credential are NOT selectively
-<<<<<<< HEAD
                 disclosable (i.e., such properties SHOULD be disclosed). These properties can include but are not
                 limited to <a data-cite="VC-DATA-MODEL-2.0#contexts"><code>@context</code></a>,
                 <a data-cite="VC-DATA-MODEL-2.0#types"><code>type</code></a>,
                 <a data-cite="VC-DATA-MODEL-2.0#status"><code>credentialStatus</code></a>,
                 <a data-cite="VC-DATA-MODEL-2.0#data-schemas"><code>credentialSchema</code></a>,
                 and <a data-cite="VC-DATA-MODEL-2.0#integrity-of-related-resources"><code>relatedResource</code></a>.
-||||||| parent of e4ca071 (rebase)
-                disclosable (i.e., such properties MUST be disclosed). These properties include but are not
-                limited to <a data-cite="VC-DATA-MODEL-2.0#status"><code>credentialStatus</code></a>
-                and <a data-cite="VC-DATA-MODEL-2.0#data-schemas"><code>credentialSchema</code></a>.
-=======
-                disclosable (i.e., such properties MUST be disclosed). These properties include but are not
-                limited to <a data-cite="VC-DATA-MODEL-2.0#contexts"><code>@context</code></a>,
-                <a data-cite="VC-DATA-MODEL-2.0#types"><code>type</code></a>,
-                <a data-cite="VC-DATA-MODEL-2.0#status"><code>credentialStatus</code></a>
-                and <a data-cite="VC-DATA-MODEL-2.0#data-schemas"><code>credentialSchema</code></a>,
-                and <a data-cite="VC-DATA-MODEL-2.0#integrity-of-related-resources"><code>relatedResource</code></a>.
->>>>>>> e4ca071 (rebase)
             </p>
 	    <p>
 	      To encrypt a secured [=verifiable credential=]