search

bluehalo / ngx-leaflet-tutorial-plugins

MIT License
22 stars 10 forks source link

Add Leaflet.Fullscreen sample #3

Closed sgrillon14 closed 6 years ago

sgrillon14 commented 6 years ago

image

sgrillon14 commented 6 years ago

ready for use with docs in main page (add by @othiym21)

reblace commented 6 years ago

I'll take care of this soon. On vacation this week. Thanks for the contribution!

reblace commented 6 years ago

I need to change the base of this PR to go against develop. When I do, there are a bunch of conflicts.

The conflicts are a result of trying to merge together the changes made for the browser print and fullscreen examples. It looks like at one point the two PRs were on the same branch and then you separated and cleaned up each branch. The issue this has caused is there are conflicting deletes that are making Git think you moved a bunch of stuff.

Anyhow, can you fix the conflicts now that I've changed the base to develop? Thanks.

sgrillon14 commented 6 years ago

I do not acces to "resolve conficts" button !! image

reblace commented 6 years ago

You would need to merge my develop branch into your branch and resolve the conflicts there. Alternatively, you could create a clean branch off of my develop branch and copy over the relevant changes.

reblace commented 6 years ago

Added the fullscreen example manually. Thanks for the contribution!