Fix merge conflicts in PR #102 #114
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Manu Sporny <msporny@digitalbazaar.com>
Co-authored-by: Dave Longley <dlongley@digitalbazaar.com>
Co-authored-by: Dave Longley <dlongley@digitalbazaar.com>
Co-authored-by: Manu Sporny <msporny@digitalbazaar.com>
I'm keeping the duplicate from the abstract, but updating as requested. I agree that duplicating the abstract is a bit painful, but without it, the opening felt out of context. Co-authored-by: Ted Thibodeau Jr <tthibodeau@openlinksw.com>
msporny
force-pushed
the
LegReq-andrieu-introduction
branch
from
708c9f4 to
f7bc40c
Compare
|
This PR is a continuation of #102. Editorial, multiple reviews, changes requested and made, no objections, merging. |
This was referenced Oct 28, 2024
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR attempts to fix various merge conflicts in PR #102.
Preview | Diff