-
Notifications
You must be signed in to change notification settings - Fork 141
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adam Stallard Oct 2024 fixes #1030
Open
adamstallard
wants to merge
21
commits into
pluralitybook:main
Choose a base branch
from
adamstallard:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+17
−18
Open
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
adf34c7
Update 3-1-living-in-a-⿻-world.md - add "are founded"
adamstallard bef5af5
Update 3-2-connected-society.md who -> whom
adamstallard 43e36bb
Update 3-3-the-lost-dao.md "key pace" -> "keep pace"
adamstallard 7181632
Update 3-3-the-lost-dao.md "the" educational system
adamstallard 3fd7cde
Update 4-1-identity-and-personhood.md readability fix
adamstallard 341da7c
Update 4-2-association-and-⿻-publics.md "no" -> "not"
adamstallard 83a8427
Update 4-2-association-and-⿻-publics.md "Waldon" -> "Waldo"
adamstallard 67d28ed
Merge pull request #1 from adamstallard/patch-1
adamstallard 138da28
Merge branch 'main' into main
adamstallard 044e1fa
Update 5-0-collaborative-technology-and-democracy.md add space
adamstallard 5b1a3ad
Update 5-3-creative-collaborations.md "intelligence" -> "intelligent"
adamstallard ed00183
Update 5-4-augmented-deliberation.md remove space
adamstallard 105986a
Update 5-7-social-markets.md "partly" -> "party"
adamstallard 2bbd363
Update 5-7-social-markets.md "impedes" -> "impede"
adamstallard 947e417
Update 5-7-social-markets.md "exercising" -> "exercise"
adamstallard 970027d
Update 7-0-policy.md . Remove "necessary" (redundant)
adamstallard a649641
Update 7-0-policy.md Remove redundant sentence
adamstallard b505c44
Update 7-0-policy.md "organization" -> "organizations"
adamstallard 4c8e7bf
Update 7-1-conclusion.md "diffusing" -> "defusing"
adamstallard 8a22d95
Merge branch 'main' into oct-2024-fixes
adamstallard 49a706d
Merge pull request #2 from adamstallard/oct-2024-fixes
adamstallard File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I resolved the conflict on this line and merged the changes.