Update tool_and_resource_list.yml

fixing conflicts

Author: bianchini88

_data/tool_and_resource_list.yml

@@ -3481,12 +3481,10 @@
     fairsharing: 1943d4
     tess: CSV
   url: https://tools.ietf.org/html/rfc4180
-<<<<<<< cancerdata-dev
 - description: A data model for the collection of cancer-related clinical information and genomics metadata.
   name:  The Minimal Dataset for Cancer of the 1+Million Genomes Initiative (1+MG-MDC)
   id: 1+mg-mdc
   url: https://zenodo.org/records/10784601
-=======
 - description: The PSI-MS Controlled Vocabulary consists of a large collection of structured terms covering description and use of Mass Spectrometry instrumentation as well as Protein Identification and Quantitation software.
   id: psi-ms
   name: HUPO PSI Mass Spectrometry Controlled Vocabulary (PSI-MS CV)
@@ -3548,4 +3546,3 @@
   registry:
     fairsharing: uBpQ1q
   url: https://panoramaweb.org/home/project-begin.view
->>>>>>> master