Skip to content

Commit

Permalink
Merge Conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
lukewli-anonyome committed Jul 24, 2024
1 parent 7e98f27 commit 2dd628c
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 498 deletions.
48 changes: 0 additions & 48 deletions aries/aries_vcx_core/src/errors/mapping_indy_api_types.rs

This file was deleted.

195 changes: 0 additions & 195 deletions did_core/did_doc/tests/serde.rs

This file was deleted.

106 changes: 0 additions & 106 deletions did_core/did_doc_sov/tests/builder.rs

This file was deleted.

Loading

0 comments on commit 2dd628c

Please sign in to comment.