From 833ad0bf47f9c42e33743ed5b0de7851ef66bbf1 Mon Sep 17 00:00:00 2001
From: JasperBoom <jboom@infernum.nl>
Date: Fri, 11 Jun 2021 18:06:21 +0200
Subject: [PATCH] Remove weird line.

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4bade6..83da539 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,6 @@ that users understand how the changes affect the new version.
 
 version 5.0.0-dev
 ---------------------------
-<<<<<<< HEAD
 + Fix output files in ccs.wdl.
 + Update biowdl-input-converter to version 0.3.
 + Update minimap2 to version 2.20.
-- 
GitLab