Resolve conflicts between spk (#1957) and PR #1970 #1996
Closed
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR #1970 made
[=AAGUID=]
autolinks ambiguous, requiring them to be disamgiguated as either[=AAGUID=]
or[=authData/attestedCredentialData/aaguid=]
. This PR resolves the conflicts with PR #1957 caused by this.Conflicts:
Resolution:
Preview | Diff