Resolve merge conflicts#1
Merged
Merged
Conversation
* Update structural_bioinformatics.md * add contributor * eol * moving to new way of tagging tools * Update CONTRIBUTORS.yaml Add more fields to the contributor yaml * Update CONTRIBUTORS.yaml Delete role field * Update structural_bioinformatics.md Update text to include new way of adding tools * Update tool_and_resource_list.yml update YAML to include remaining tools * Update structural_bioinformatics.md Add minor text suggestions * Update tool_and_resource_list.yml spelling * Update tool_and_resource_list.yml * Update structural_bioinformatics.md minor text improvement --------- Co-authored-by: bedroesb <bedro@psb.vib-ugent.be> Co-authored-by: Bert Droesbeke <44875756+bedroesb@users.noreply.github.com> Co-authored-by: Federico Bianchini <72258479+bianchini88@users.noreply.github.com>
* Update plant_sciences.md first step for adding dmp to plant sciences page * Update plant_phenomics_assembly.md move the dmp text to plant sciences page * edit DMP sections for plant sciences * Update plant_sciences.md * add DSW intro in plant tool assemblies * Update plant_genomics_assembly.md DSW added as tool * Update plant_sciences.md adding DSW, DMPonline as tools. Edit links to other RDMkit pages (Planning, data management plan) * Update plant_sciences.md miappe as a tool * Update tool_and_resource_list.yml add dataplan and opidor * Update plant_sciences.md dataplan and opidor as tools * move dataplan * leave opidor as a national resource and not a tool --------- Co-authored-by: bedroesb <bedro@psb.vib-ugent.be> Co-authored-by: floradanna <51486716+floradanna@users.noreply.github.com>
Co-authored-by: bedroesb <bedroesb@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
No description provided.