Merge Conflicts

Signed-off-by: lli <[email protected]>
hyperledger · Jul 24, 2024 · 8236c92 · 8236c92
1 parent 7d00707
commit 8236c92
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 498 deletions.
diff --git a/aries/aries_vcx_core/src/errors/mapping_indy_api_types.rs b/aries/aries_vcx_core/src/errors/mapping_indy_api_types.rs
diff --git a/did_core/did_doc/tests/serde.rs b/did_core/did_doc/tests/serde.rs
diff --git a/did_core/did_doc_sov/tests/builder.rs b/did_core/did_doc_sov/tests/builder.rs