Skip to content
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

Testing #22460

Merged
merged 2 commits into from
Jun 17, 2024
Merged

Testing #22460

merged 2 commits into from
Jun 17, 2024

Conversation

shreeentka
Copy link
Contributor

I've tried to resolve the merge conflict .

Copy link
Contributor

⚠️ MERGE CONFLICT DETECTED!

@shreeentka A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

1 similar comment
Copy link
Contributor

⚠️ MERGE CONFLICT DETECTED!

@shreeentka A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

CONTRIBUTORS.md Outdated
-[@On4m](https://github.com/On4m)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
-[@On4m](https://github.com/On4m)
- [@On4m](https://github.com/On4m)

@zero-to-mastery-bot zero-to-mastery-bot bot merged commit 6d2b048 into zero-to-mastery:master Jun 17, 2024
1 check passed
Copy link
Contributor

🙏 Thanks for your pull request @shreeentka, The team will now review and merge this request. In the mean time why not check out some of the other opensource projects available, contributions are greatly appreciated!

Some of the most popular are


PR Statistics

#️⃣ PR Number: Line Additions: 🗑️ Line Deletions:
22460 3 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
1 2574 16925

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants