Move display & MIME stuff out of helpDB, xrefs #22890
Merged
Conversation
This file contains 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
kshyatt
added
domain:docs
KristofferC
approved these changes
Jul 20, 2017
fredrikekre
approved these changes
Jul 20, 2017
tkelman
reviewed
Jul 21, 2017
base/docs/helpdb/Base.jl
Outdated
|
|
||
| Determine whether Julia is running an interactive session. | ||
| """ | ||
| isinteractive |
There was a problem hiding this comment.
I'm really confused about why github is showing a merge conflict. If I look at the files changed tab, it matches what I have on my desktop, which has isinteractive still in helpdb...
There was a problem hiding this comment.
Oh I see! Yes it appears this got put back! Ugh, sorry!
|
OK!! IDK what happened there but it seems the conflict is resolved. Make sure to squash this, whoever merges it. |
Sacha0
approved these changes
Jul 22, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.