sync this branch with master #686
Closed
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
…s_example Fix NXtransformation example
resolve Sphinx errors
…d NXsource as copy of NXsource base class but make name required. Co-authored-by: Graeme Winter <graeme.winter@gmail.com>
Also sync documentation between NXmx and NXdetector.
long_name values swapped in verysimple example
additional NXdetector documentation
|
There are merge conflicts after merging master. Should not be the case. Drop this and try again. |
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.
The anyUnitsAttr_555 branch is 275 commits behind master and only 8 commits ahead. Merge in the current master branch.