fix rebasing

openid · Jan 28, 2025 · f2c2e4d · f2c2e4d
2 parents bcd507f + 49ffbb0
commit f2c2e4d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/openid4vc-high-assurance-interoperability-profile-1_0.md b/openid4vc-high-assurance-interoperability-profile-1_0.md
@@ -184,6 +184,10 @@ The following requirements apply for both, the Wallet and the Verifier, unless s
   value `ECDH-ES` (as defined in [@!RFC7518, section 4.6]), with key agreement utilizing keys on the `P-256` curve (see [@!RFC7518, section 6.2.1.1]) MUST be supported.
   The JWE `enc` (encryption algorithm) header parameter (see [@!RFC7516, section 4.1.2]) value `A128GCM` (as defined in [@!RFC7518, section 5.3]) MUST be supported.
 * The DCQL query and response as defined in Section 6 of [@!OIDF.OID4VP] MUST be used. Presentation Exchange as defined in Sections 5.4 and 5.5 of [@!OIDF.OID4VP] MUST NOT be used.
+<<<<<<< HEAD
+=======
+
+>>>>>>> origin/main
 
 ## ISO mdoc specific requirements for OpenID for Verifiable Presentations over W3C Digital Credentials API