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

Fix dive site string merging #214

Merged
merged 1 commit into from
Feb 20, 2017

Conversation

torvalds
Copy link
Collaborator

If the second dive site doesn't have a particular string, but the first
one does, we did the wrong thing and created a result string like

(first dive site string) or ((null))

which is not useful. We should just use the first dive site string
as-is.

Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

If the second dive site doesn't have a particular string, but the first
one does, we did the wrong thing and created a result string like

   (first dive site string) or ((null))

which is not useful.  We should just use the first dive site string
as-is.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
@dirkhh dirkhh merged commit 2e77a22 into subsurface:master Feb 20, 2017
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

2 participants