From 30abfb69b371a9fe4c0017a2cbf9012d7cecc0c7 Mon Sep 17 00:00:00 2001
From: "Gervaise H. Henry" <gervaise.henry@utsouthwestern.edu>
Date: Tue, 2 Mar 2021 10:53:06 -0600
Subject: [PATCH] Update changelog

---
 CHANGELOG.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87548ac..1025ae0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,9 @@
 * Strandedness metadata "yes"/"no" changed to boolean "t"/"f" in data-hub, pipeline updated to handle (#70) ("yes"/"no" still acceptable for backwards compatibility)
 * Upload empty mRNA_QC entry if data error (#111)
 * Allow forcing of strandedness and spike (#100)
-<<<<<<< HEAD
 * Add seqwho
-=======
+* Add seqwho results to multiqc report
 * Modify repository structure to allow for use with XPACK-DNANEXUS
->>>>>>> develop
 
 **Background**
 * Add memory limit (75%) per thread for samtools sort (#108)
-- 
GitLab