w3c / did-rubric

W3C Decentralized Characteristics Rubric v1.0
https://w3c.github.io/did-rubric/
Other
14 stars 16 forks source link

Add examples for Regulatory Compliance #35

Closed dhh1128 closed 2 years ago

dhh1128 commented 2 years ago

Signed-off-by: dhh1128 daniel.hardman@sicpa.com


Preview | Diff

jandrieu commented 2 years ago

@dhh1128 Can you take a look at the merge conflicts?

jandrieu commented 2 years ago

FWIW, I merged the PRs in order, up to this one. Then I tried #36 and it worked fine.

So, this is the last one of the set.

dhh1128 commented 2 years ago

Yep, I'll fix this.

jandrieu commented 2 years ago

It may be easiest just to reset --hard and manually cherry pick the changed sections.

dhh1128 commented 2 years ago

I couldn't figure out why git kept interpreting this change as having a thousand-line merge conflict. So I re-created the change from scratch to make a nice, clean, small update. This PR is now obsoleted by #37.