Fix merging output.md

docs/output.md

@@ -32,17 +32,8 @@ Additionally, we provide pipeline information with report metrics generated duri
 
 </details>
 
-<<<<<<< HEAD
-
 ### netMHCpan
 
-=======
-[FastQC](http://www.bioinformatics.babraham.ac.uk/projects/fastqc/) gives general quality metrics about your sequenced reads. It provides information about the quality score distribution across your reads, per base sequence content (%A/T/G/C), adapter contamination and overrepresented sequences. For further reading and documentation see the [FastQC help pages](http://www.bioinformatics.babraham.ac.uk/projects/fastqc/Help/).
-
-### MultiQC
-
-> > > > > > > TEMPLATE
-
 <details markdown="1">
 <summary>Output files</summary>
 
@@ -54,8 +45,6 @@ Additionally, we provide pipeline information with report metrics generated duri
 
 ### netMHCstabpan
 
-<<<<<<< HEAD
-
 <details markdown="1">
 <summary>Output files</summary>
 
@@ -113,11 +102,7 @@ Additionally, we provide pipeline information with report metrics generated duri
   - logA : Log of the amplitude. This is a function of kd/kdWT and a constant
   - quality: The final output of the pipeline and neoantigen editing. A higher quality is a better neoantigen. This is decribed in the Luksza et al. paper and is visualized below
 
-# </details>
-
-Results generated by MultiQC collate pipeline QC from supported tools e.g. FastQC. The pipeline has special steps which also allow the software versions to be reported in the MultiQC output for future traceability. For more information about how to use MultiQC reports, see <http://multiqc.info>.
-
-> > > > > > > TEMPLATE
+</details>
 
 ### Pipeline information