@jljordan42 I could not resolve this merge conflict myself. Normally I can, but you must have a different set of permissions on your github fork than many other collaborators do.
Anyway, I cherry-picked your commit into a different branch of my repo and merged it from there. See https://github.com/openssi/peer-did-method-spec/pull/94. So your change was merged and credited to you, and this PR is now redundant. Closing.
@jljordan42 I could not resolve this merge conflict myself. Normally I can, but you must have a different set of permissions on your github fork than many other collaborators do.
Anyway, I cherry-picked your commit into a different branch of my repo and merged it from there. See https://github.com/openssi/peer-did-method-spec/pull/94. So your change was merged and credited to you, and this PR is now redundant. Closing.