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

Conflicts with "The Events Calendar" also active #40

Merged
merged 7 commits into from
Jul 19, 2019

Conversation

jasonbahl
Copy link
Collaborator

@jasonbahl jasonbahl commented Jul 16, 2019

  • This is an initial attempt at addressing the conflict with The Events Calendar, reported by @mhinton

- This is an initial attempt at addressing the conflict. This is not ready for merge, but wanted to test to see if the general approach fixes the conflict for @mhinton
@jasonbahl jasonbahl self-assigned this Jul 16, 2019
- This is an initial attempt at addressing the conflict. This is not ready for merge, but wanted to test to see if the general approach fixes the conflict for @mhinton
- refactored a bit to keep things a bit cleaner
@jasonbahl jasonbahl changed the title DO NOT MERGE Conflicts with "The Events Calendar" also active Jul 18, 2019
@jasonbahl
Copy link
Collaborator Author

closes #39

- refactored a bit to keep things a bit cleaner
@jasonbahl jasonbahl added the bug label Jul 19, 2019
@jasonbahl jasonbahl merged commit 522cb24 into master Jul 19, 2019
@jasonbahl jasonbahl deleted the bug/#39-conflict-with-the-events-calendar branch January 29, 2020 14:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant