search

zero-to-mastery / ZTM-Quest

A fun little 2D top-down rpg where you can explore the world of zero-to-mastery. Be prepared for funny and serious content and of course, Bruno.
https://zero-to-mastery.github.io/ZTM-Quest/
27 stars 92 forks source link

fix: change object location and iteraction #134

Closed poschuler closed 1 month ago

poschuler commented 1 month ago
zero-to-mastery-bot[bot] commented 1 month ago

⚠️ MERGE CONFLICT DETECTED!

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

zero-to-mastery-bot[bot] commented 1 month ago

⚠️ MERGE CONFLICT DETECTED!

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

zero-to-mastery-bot[bot] commented 1 month ago

⚠️ MERGE CONFLICT DETECTED!

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

zero-to-mastery-bot[bot] commented 1 month ago

🙏 Thanks for your pull request @poschuler, 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:
134 7 6
📑 Files Changed: ⭐ Repo Stars: 🔱 Total Forks:
2 27 70
zero-to-mastery-bot[bot] commented 1 month ago

🙏 Thanks for your pull request @poschuler, 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:
134 7 6
📑 Files Changed: ⭐ Repo Stars: 🔱 Total Forks:
2 27 70