Skip to content

Removes warning about conflicts with Draw plugin #1184

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

Merged
merged 1 commit into from
Jul 23, 2019

Conversation

fullonic
Copy link
Contributor

PR #1180 fixed this conflict.

@fullonic fullonic force-pushed the update_locateControl branch 3 times, most recently from 0be87d6 to 8bcb688 Compare July 23, 2019 08:35
@Conengmo
Copy link
Member

It did? Seems unlikely doesn't it, since all we did was add the if statement. If that's true, the situation is still the same.

Do you know what the conflict was, and why it's fixed now?

@fullonic
Copy link
Contributor Author

It fixes the conflict because it was related with the javascript type error caused by the Draw plugin. Fixing the js error fixed this conflict.
Actually, the conflict wasn't only with the LocateControl plugin, I found it as well using the Fullscreen plugin and Draw together. I tested the LocateControl plugin after fixing the Draw js type error and it works without conflicts.

@Conengmo
Copy link
Member

Thanks for explaining. I haven't tried this out myself but I trust you to have looked into this.

Before merging this, could you take out the commit that changes CONTRIBUTING.md?

@fullonic fullonic force-pushed the update_locateControl branch 2 times, most recently from 0cd5744 to 8bcb688 Compare July 23, 2019 14:53
@fullonic fullonic force-pushed the update_locateControl branch from 8bcb688 to 0fbd717 Compare July 23, 2019 14:54
@fullonic
Copy link
Contributor Author

@Conengmo, Thanks.
I removed the CONTRIBUTING.md. It was from updating my master branch with the folium master.
Cheers

@Conengmo Conengmo merged commit 40b2860 into python-visualization:master Jul 23, 2019
@Conengmo
Copy link
Member

Thanks @fullonic! Nice we got this sorted out.

@fullonic fullonic deleted the update_locateControl branch July 25, 2019 09:21
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.

2 participants