search

jolocom / jolocom-lib

Library for interacting with the identity solution provided by Jolocom.
MIT License
24 stars 18 forks source link

Fix/merge develop #412

Closed mnzaki closed 4 years ago

mnzaki commented 4 years ago

There were conflicts in the following files: Conflicts: tests/data/didDocument.data.ts tests/jolocomRegistry/create.test.ts ts/identityWallet/identityWallet.ts ts/registries/jolocomRegistry.ts

mnzaki commented 4 years ago

out of date and handled elsewhere