Fix merge conflicts for the "Stomatogastric ganglion crab lobster" #1
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
* Def and refs * edited parent term * definition amend and partonomy update * plural -> singular --------- Co-authored-by: CEastwood <116108977+Caroline-99@users.noreply.github.com>
…te (#2653) * Obsolete neuronal brush cells and adjust logical definition of tanycyte Fixes #2514 #2634 * Update cl-edit.owl * Update merged_import.owl * Update cl-edit.owl Fixed incomplete obsoletion --------- Co-authored-by: CEastwood <116108977+Caroline-99@users.noreply.github.com> Co-authored-by: dosumis <dosumis@gmail.com> Co-authored-by: Caroline Eastwood <ce12@sanger.ac.uk>
* defs, refs, uberon import stomach smooth muscle inner oblique layer imported from uberon * refresh merged_import.owl * ref update, equiv class updayte * ref removed --------- Co-authored-by: CEastwood <116108977+Caroline-99@users.noreply.github.com>
* def and refs * partonomy added --------- Co-authored-by: CEastwood <116108977+Caroline-99@users.noreply.github.com>
* Fixes #2904 - NTR subclasses of nasal tuft cell - Added two terms tuft cell of olfactory epithelium and tuft cell of nasal cavity respiratory epithelium. -Fixed logical definition of olfactory epithelial cell and basal cell of olfactory epithelium. * Update cl-edit.owl
* def and refs * partonomy added * changed synonym type to related and abbreviations --------- Co-authored-by: JABelfiore <jb69@sanger.ac.uk> Co-authored-by: Jasmine Belfiore <166385424+JABelfiore@users.noreply.github.com>
Co-authored-by: CEastwood <116108977+Caroline-99@users.noreply.github.com>
We remove a bunch of rules in the custom Makefile that were intended to generate some custom diffs. Those rules are never called from amywhere, so the diffs are only generated when they are explicitly called by a user on the command line -- which means they are probably never used at all, especially now that we are producing and *publishing* more complete diffs on every release. closes #2641
* def and refs * doi to PMID * second sentence removed * 2nd sentence removed --------- Co-authored-by: CEastwood <116108977+Caroline-99@users.noreply.github.com>
* def and refs * added myenteric to name * name update * name change, space added, synonym added * synonym ref added --------- Co-authored-by: CEastwood <116108977+Caroline-99@users.noreply.github.com>
* def and refs * added synonym --------- Co-authored-by: CEastwood <116108977+Caroline-99@users.noreply.github.com>
* dogiel type I mesenteric neuron * typo fix * inline refs, typo, removed 2nd sentence * logical def updated --------- Co-authored-by: David Osumi-Sutherland <dosumis@gmail.com>
* def and refs * synonym added * doi lowercase * doi to PMID * changed to related synonym * added abbreviation property type
* merge mucous neck cell * improved def * redundancies removed (inference checked) --------- Co-authored-by: CEastwood <116108977+Caroline-99@users.noreply.github.com> Co-authored-by: David Osumi-Sutherland <dosumis@gmail.com>
|
Thank you! |
stevewds
merged commit 2ff203f
into
Waltham-Data-Science:stomatogastric_ganglion_crab_lobster
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.
This PR resolves the existing conflicts on the original PR submitted to CL.
Once it will have been merged here, on the CL side we will be able to merge the resulting, fixed PR.