fix: remove merge conflict markers from README #373
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
# Description There were an obvious merge conflict markers in the README.md (sections starting with `<<<<<< HEAD`) and a seemingly outdated changelog. To keep the README clean, I propose to remove this section. However, the section was supposed to be dedicated to sponsors and supporters and I could not find an up-to-date list of sponsors to include there. I believe this is up to @MrNeRF to figure out. Since there were no sponsors, I removed the whole section, but we should obviously bring it back if there are any.
Contributor
Author
|
@MrNeRF what do you think? We can close this PR is this is something you don't want to change. I just thought it looks weird right in the readme |
Contributor
Author
|
@MrNeRF sorry to bother you. shall we close this? |
Owner
|
Sorry for the late reply. Focusing currently on another project. You are right, there is an merge issue. The paper list was moved to the website and should not come back into the Readme. The Readme.md should only contain resources that are not papers. If you want to fix it this way, we can merge the update. Again, sorry for my late reply. |
Contributor
Author
|
@MrNeRF np. That makes sense. I'll fix it that way |
Contributor
Author
|
@MrNeRF I removed all papers now. Wanna take a look? 👀 |
Owner
|
Thank you. Lgtm! |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description
There were an obvious merge conflict markers in the README.md (sections starting with
<<<<<<< HEAD) and a seemingly outdated changelog. To keep the README clean, I propose to remove this section.However, the section was supposed to be dedicated to sponsors and supporters and I could not find an up-to-date list of sponsors to include there. I believe this is up to @MrNeRF to figure out.
Since there were no sponsors, I removed the whole section, but we should obviously bring it back if there are any.