Fix duplicated text in Glossary introduced by merge conflict#24
Open
scrool wants to merge 1 commit intoSpenceKonde:masterfrom
Open
Fix duplicated text in Glossary introduced by merge conflict#24scrool wants to merge 1 commit intoSpenceKonde:masterfrom
scrool wants to merge 1 commit intoSpenceKonde:masterfrom
Conversation
Before these changes Glossary contained couple of sections of duplicated text which seem to be caused by a merge conflict with stashed changes. I have picked those parts that had more text and used structured formatting with titles rather bullet points - most of it comes from previous commit 30c087d. I have removed paragraph: See (classicperipheraltable.md)(this table of Classic AVR peripherals and which parts have them) for a full list (this table has not been created as of 4/14/2020, but it will be) originally from the stash which is referring to nonexistant file. Separators like `=======` which git added during merge conflict have formatting meaning in markdown so after these changes text should render without whole sentences marked as titles again.
scrool
force-pushed
the
fix_stash_merge_conflict
branch
from
9ece115 to
e47bfcf
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Before these changes Glossary contained couple of sections of duplicated text which seem to be caused by a merge conflict with stashed changes.
I have picked those parts that had more text and used structured formatting with titles rather bullet points - most of it comes from previous commit 30c087d.
I have removed paragraph:
originally from the stash which is referring to nonexistant file.
Separators like
=======which git added during merge conflict have formatting meaning in markdown so after these changes text should render without whole sentences marked as titles again.