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

Addind my art to the project #2424

Merged
merged 4 commits into from
Nov 12, 2023

Conversation

albertomtferreira
Copy link
Contributor

Added my project to the list.

Copy link

🙏 Thanks for your pull request @albertomtferreira, 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:
2424 27 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
3 287 3242

Copy link

🙏 Thanks for your pull request @albertomtferreira, 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:
2424 34 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
4 287 3242

include.js Outdated Show resolved Hide resolved
Copy link

🙏 Thanks for your pull request @albertomtferreira, 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:
2424 34 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
4 286 3247

1 similar comment
Copy link

🙏 Thanks for your pull request @albertomtferreira, 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:
2424 34 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
4 286 3247

following Sophia's request, I removed the comments on the file.
@zero-to-mastery-bot zero-to-mastery-bot bot added the Conflict Present There is a conflict that can't be resolved in the web editor and must be resolved by the user. label Nov 12, 2023
Copy link

⚠️ MERGE CONFLICT DETECTED!

@albertomtferreira 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

⚠️ MERGE CONFLICT DETECTED!

@albertomtferreira 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.

Copy link
Contributor Author

@albertomtferreira albertomtferreira left a comment

Choose a reason for hiding this comment

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

Comments removed

@zero-to-mastery-bot zero-to-mastery-bot bot removed the Conflict Present There is a conflict that can't be resolved in the web editor and must be resolved by the user. label Nov 12, 2023
@sophiabrandt sophiabrandt merged commit f5878f1 into zero-to-mastery:master Nov 12, 2023
3 of 4 checks passed
Copy link

🙏 Thanks for your pull request @albertomtferreira, 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:
2424 34 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
4 286 3247

Copy link
Contributor Author

@albertomtferreira albertomtferreira left a comment

Choose a reason for hiding this comment

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

Not sure why I have a new reques!

@sophiabrandt
Copy link
Member

@albertomtferreira Interesting. I assume it's because there were merge conflicts. Normally, it's on the person who makes the pull request to resolve those, but I have done that for you. The Zerobot is not very smart about this. You can ignore it.

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