Fix unresolved merge conflict markers in Contributors.md - #122645
Open
thomasjunius-prog wants to merge 1 commit into
Open
Fix unresolved merge conflict markers in Contributors.md#122645thomasjunius-prog wants to merge 1 commit into
thomasjunius-prog wants to merge 1 commit into
Conversation
Leftover <<<<<<< / ======= / >>>>>>> markers from a prior merge were committed to main, keeping both Anshul Kumar and Mayank Dhanagar's entries intact. Also adds my own entry as a first contribution.
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
👋 Hi @thomasjunius-prog!
Great job reaching the final step! However, it looks like there are 7 lines of changes.
No preview available.
The tutorial works best when you add exactly one line. Please follow tutorial carefully.
We're excited to have you in the community!
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.
Summary
<<<<<<< HEAD/=======/>>>>>>> b07d95969conflict markers that were accidentally committed toContributors.mdon main, while keeping both contributor entries (Anshul Kumar and Mayank Dhanagar) that the conflict was between.Test plan