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

Option to Enable/Disable Pokemon catching #298

Open
wants to merge 13 commits into
base: development
Choose a base branch
from
Open

Option to Enable/Disable Pokemon catching #298

wants to merge 13 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Aug 1, 2016

Has been tested and is working.

@DurtyFree
Copy link
Member

Please fix the merge conflicts @mvegter197 :)

@ghost
Copy link
Author

ghost commented Aug 2, 2016

@DurtyFree @Jazed Done and ready to be merged 😄

This was referenced Aug 2, 2016
@DurtyFree
Copy link
Member

This again has conflicts, sry :(
Please fix :D
@mvegter197

@ghost
Copy link
Author

ghost commented Aug 3, 2016

@DurtyFree I won't be able to update it as I'm curently on holiday. I saw a duplicate PR of this after mine so it would be best to temporlily close this one and continue with the other PR.

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

Successfully merging this pull request may close these issues.

1 participant