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

Added Switch changes to 'my' command #38

Open
wants to merge 14 commits into
base: sog
Choose a base branch
from
Open

Added Switch changes to 'my' command #38

wants to merge 14 commits into from

Conversation

itslazyvar
Copy link
Contributor

Added Switch changes to ‘my’ command

Copy link
Owner

@GeekyDeaks GeekyDeaks left a comment

Choose a reason for hiding this comment

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

Sorry chap - it looks like you have managed to bring along the changes from sog to master in this commit so it will trash the sog branch in it's current form. I can cherry pick the my.js file for now, but you might want to clean out your master so that it's up-to-date with my sog

@itslazyvar
Copy link
Contributor Author

Seems like I've shit the bed by contaminating one branch with another. Perhaps you can revert to 469420f

I'll then make sure my master is in sync with the sog branch and do a pull request from there. The changes I made were hardly 5 minutes work so that shouldn't be too much of an issue..

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

3 participants