From 152ea42338ade959d84d4fc19753b4706fc5e65a Mon Sep 17 00:00:00 2001
From: emmarousseau <emmarou1@icloud.com>
Date: Sun, 24 Mar 2024 19:44:49 +0100
Subject: [PATCH] resolve changelog conflict

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37d75188..66fffa28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,8 @@
 
 * `star/star_align_reads`: Align reads to a reference genome (PR #22).
 
+* `gffread`: Validate, filter, convert and perform other operations on GFF files (PR #29). 
+
 * `samtools`:
     - `samtools/flagstat`: Counts the number of alignments in SAM/BAM/CRAM files for each FLAG type (PR #30).