Updated maps for norway #1632
Merged
Updated maps for norway #1632
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
Needs a rebase, there's some conflicts. |
Contributor
Author
|
@stephendade I have rebased it but did not try to make the cleanliness check happy, as splitting that line would be more messy. |
Contributor
|
That's fine, you'll just need to re-add |
Contributor
Author
|
Ah, I thought that was something git added, did not understood why it was there, thought it was something from the conflict-resolving process, and now I learned why it was there. :) |
Contributor
|
Thanks - merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
the update replaces the older sources for the Norwegian maps